[PATCH] Make touch_nmi_watchdog imply touch_softlockup_watchdog on all archs

touch_nmi_watchdog() calls touch_softlockup_watchdog() on both
architectures that implement it (i386 and x86_64). On other architectures
it does nothing at all. touch_nmi_watchdog() should imply
touch_softlockup_watchdog() on all architectures.
Suggested by Andi Kleen.

Signed-off-by: Michal Schmidt <[email protected]>

diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index c8f4d2f..e16904e 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -4,6 +4,7 @@
#ifndef LINUX_NMI_H
#define LINUX_NMI_H

+#include <linux/sched.h>
#include <asm/irq.h>

/**
@@ -16,7 +17,7 @@ #include <asm/irq.h>
#ifdef ARCH_HAS_NMI_WATCHDOG
extern void touch_nmi_watchdog(void);
#else
-# define touch_nmi_watchdog() do { } while(0)
+# define touch_nmi_watchdog() touch_softlockup_watchdog()
#endif

#endif

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • Re: [PATCH] Make touch_nmi_watchdog imply touch_softlockup_watchdog on all archs
    • From: Ingo Molnar <[email protected]>

• References:
  • [patch] IDE: Touch NMI watchdog during resume from STR
    • From: Michal Schmidt <[email protected]>
  • Re: [patch] IDE: Touch NMI watchdog during resume from STR
    • From: Andi Kleen <[email protected]>
  • Re: [patch] IDE: Touch NMI watchdog during resume from STR
    • From: Michal Schmidt <[email protected]>
  • Re: [patch] IDE: Touch NMI watchdog during resume from STR
    • From: Andi Kleen <[email protected]>

• Prev by Date: Private driver support emails should be avoided.
• Next by Date: Re: the " 'official' point of view" expressed by kernelnewbies.org regarding reiser4 inclusion
• Previous by thread: Re: [patch] IDE: Touch NMI watchdog during resume from STR
• Next by thread: Re: [PATCH] Make touch_nmi_watchdog imply touch_softlockup_watchdog on all archs
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]