public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Michal Schmidt <xschmi00@stud.feec.vutbr.cz>
To: linux-kernel@vger.kernel.org
Cc: Andi Kleen <ak@suse.de>, Ingo Molnar <mingo@elte.hu>
Subject: [PATCH] Make touch_nmi_watchdog imply touch_softlockup_watchdog on all archs
Date: Mon, 24 Jul 2006 00:06:03 +0200	[thread overview]
Message-ID: <44C3F2CB.5090204@stud.feec.vutbr.cz> (raw)
In-Reply-To: <200607131936.34832.ak@suse.de>

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 <xschmi00@stud.feec.vutbr.cz>

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


  reply	other threads:[~2006-07-23 22:06 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-07-13 10:14 [patch] IDE: Touch NMI watchdog during resume from STR Michal Schmidt
2006-07-13 13:28 ` Andi Kleen
2006-07-13 17:33   ` Michal Schmidt
2006-07-13 17:36     ` Andi Kleen
2006-07-23 22:06       ` Michal Schmidt [this message]
2006-07-24  7:15         ` [PATCH] Make touch_nmi_watchdog imply touch_softlockup_watchdog on all archs Ingo Molnar
2006-07-14 19:06 ` [patch] IDE: Touch NMI watchdog during resume from STR Pavel Machek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=44C3F2CB.5090204@stud.feec.vutbr.cz \
    --to=xschmi00@stud.feec.vutbr.cz \
    --cc=ak@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox