diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-s390/irq.h | 3 | ||||
-rw-r--r-- | include/linux/nmi.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-s390/irq.h b/include/asm-s390/irq.h index bd1a721f7aa2..7da991a858f8 100644 --- a/include/asm-s390/irq.h +++ b/include/asm-s390/irq.h | |||
@@ -19,8 +19,5 @@ enum interruption_class { | |||
19 | NR_IRQS, | 19 | NR_IRQS, |
20 | }; | 20 | }; |
21 | 21 | ||
22 | #define touch_nmi_watchdog() do { } while(0) | ||
23 | |||
24 | #endif /* __KERNEL__ */ | 22 | #endif /* __KERNEL__ */ |
25 | #endif | 23 | #endif |
26 | |||
diff --git a/include/linux/nmi.h b/include/linux/nmi.h index c8f4d2f627d7..e16904e28c3a 100644 --- a/include/linux/nmi.h +++ b/include/linux/nmi.h | |||
@@ -4,6 +4,7 @@ | |||
4 | #ifndef LINUX_NMI_H | 4 | #ifndef LINUX_NMI_H |
5 | #define LINUX_NMI_H | 5 | #define LINUX_NMI_H |
6 | 6 | ||
7 | #include <linux/sched.h> | ||
7 | #include <asm/irq.h> | 8 | #include <asm/irq.h> |
8 | 9 | ||
9 | /** | 10 | /** |
@@ -16,7 +17,7 @@ | |||
16 | #ifdef ARCH_HAS_NMI_WATCHDOG | 17 | #ifdef ARCH_HAS_NMI_WATCHDOG |
17 | extern void touch_nmi_watchdog(void); | 18 | extern void touch_nmi_watchdog(void); |
18 | #else | 19 | #else |
19 | # define touch_nmi_watchdog() do { } while(0) | 20 | # define touch_nmi_watchdog() touch_softlockup_watchdog() |
20 | #endif | 21 | #endif |
21 | 22 | ||
22 | #endif | 23 | #endif |