diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-06-29 16:13:25 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-06-29 16:13:25 +1000 |
| commit | 7cf0526ce2b7867e927d568f26ffca49a8c0ee43 (patch) | |
| tree | e481d70ba6900be3c8f0a3bdcba423010cd9d768 /arch/sparc/kernel/nmi.c | |
| parent | 516619b8d112c528ab4f6076dfea4371656976fb (diff) | |
| parent | 1a0df77cd27e928ea008fc995da24bc610286d42 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/sparc/kernel/nmi.c')
| -rw-r--r-- | arch/sparc/kernel/nmi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c index 95e73c63c99d..048ad783ea3f 100644 --- a/arch/sparc/kernel/nmi.c +++ b/arch/sparc/kernel/nmi.c @@ -51,7 +51,7 @@ static DEFINE_PER_CPU(unsigned int, last_irq_sum); static DEFINE_PER_CPU(long, alert_counter); static DEFINE_PER_CPU(int, nmi_touch); -void touch_nmi_watchdog(void) +void arch_touch_nmi_watchdog(void) { if (atomic_read(&nmi_active)) { int cpu; @@ -61,10 +61,8 @@ void touch_nmi_watchdog(void) per_cpu(nmi_touch, cpu) = 1; } } - - touch_softlockup_watchdog(); } -EXPORT_SYMBOL(touch_nmi_watchdog); +EXPORT_SYMBOL(arch_touch_nmi_watchdog); static void die_nmi(const char *str, struct pt_regs *regs, int do_panic) { |