diff options
| author | Erik Gilling <konkers@android.com> | 2011-09-26 12:50:31 -0700 |
|---|---|---|
| committer | Erik Gilling <konkers@android.com> | 2011-09-26 12:50:31 -0700 |
| commit | e9777254189e122b7860c8323b5736f6a6e375f4 (patch) | |
| tree | 314e25f6de87bff95c4688fcbd8f4a5ff9e45339 /arch/arm/include/asm | |
| parent | b92c357bdea205a056b435a2b542b04aa8247b8a (diff) | |
| parent | 8d4037ec21024491004c19391b97cb7ad450ad27 (diff) | |
| download | kernel_samsung_tuna-e9777254189e122b7860c8323b5736f6a6e375f4.zip kernel_samsung_tuna-e9777254189e122b7860c8323b5736f6a6e375f4.tar.gz kernel_samsung_tuna-e9777254189e122b7860c8323b5736f6a6e375f4.tar.bz2 | |
Merge branch 'linux-omap-3.0' into android-omap-3.0
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/irq.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/nmi.h | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h index 2721a58..904d0d2 100644 --- a/arch/arm/include/asm/irq.h +++ b/arch/arm/include/asm/irq.h @@ -3,6 +3,8 @@ #include <mach/irqs.h> +#define ARCH_HAS_NMI_WATCHDOG + #ifndef irq_canonicalize #define irq_canonicalize(i) (i) #endif diff --git a/arch/arm/include/asm/nmi.h b/arch/arm/include/asm/nmi.h new file mode 100644 index 0000000..3cf8bdf --- /dev/null +++ b/arch/arm/include/asm/nmi.h @@ -0,0 +1,14 @@ +#ifndef __ASM_ARM_NMI_H_ +#define __ASM_ARM_NMI_H_ + +#include <linux/notifier.h> + +extern struct atomic_notifier_head touch_watchdog_notifier_head; + +static inline void touch_nmi_watchdog(void) +{ + atomic_notifier_call_chain(&touch_watchdog_notifier_head, 0, 0); + touch_softlockup_watchdog(); +} + +#endif /* __ASM_ARM_NMI_H_ */ |