From: "Randy.Dunlap" <rdunlap@xenotime.net>
To: lkml <linux-kernel@vger.kernel.org>
Cc: akpm <akpm@osdl.org>, torvalds <torvalds@osdl.org>
Subject: [PATCH 4/9] Replace ARCH_HAS_NMI_WATCHDOG with CONFIG_ARCH_NMI_WATCHDOG
Date: Mon, 7 Aug 2006 14:00:40 -0700 [thread overview]
Message-ID: <20060807140040.84f41ef1.rdunlap@xenotime.net> (raw)
In-Reply-To: <20060807120928.c0fe7045.rdunlap@xenotime.net>
From: Randy Dunlap <rdunlap@xenotime.net>
Replace ARCH_HAS_NMI_WATCHDOG with CONFIG_ARCH_NMI_WATCHDOG.
Move it from header files to Kconfig space.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
arch/i386/Kconfig | 4 ++++
arch/x86_64/Kconfig | 4 ++++
include/asm-i386/irq.h | 4 ----
include/asm-x86_64/irq.h | 4 ----
include/linux/nmi.h | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
--- linux-2618-rc4-arch.orig/include/asm-i386/irq.h
+++ linux-2618-rc4-arch/include/asm-i386/irq.h
@@ -20,10 +20,6 @@ static __inline__ int irq_canonicalize(i
return ((irq == 2) ? 9 : irq);
}
-#ifdef CONFIG_X86_LOCAL_APIC
-# define ARCH_HAS_NMI_WATCHDOG /* See include/linux/nmi.h */
-#endif
-
#ifdef CONFIG_4KSTACKS
extern void irq_ctx_init(int cpu);
extern void irq_ctx_exit(int cpu);
--- linux-2618-rc4-arch.orig/include/asm-x86_64/irq.h
+++ linux-2618-rc4-arch/include/asm-x86_64/irq.h
@@ -44,10 +44,6 @@ static __inline__ int irq_canonicalize(i
return ((irq == 2) ? 9 : irq);
}
-#ifdef CONFIG_X86_LOCAL_APIC
-#define ARCH_HAS_NMI_WATCHDOG /* See include/linux/nmi.h */
-#endif
-
#ifdef CONFIG_HOTPLUG_CPU
#include <linux/cpumask.h>
extern void fixup_irqs(cpumask_t map);
--- linux-2618-rc4-arch.orig/include/linux/nmi.h
+++ linux-2618-rc4-arch/include/linux/nmi.h
@@ -13,7 +13,7 @@
* may be used to reset the timeout - for code which intentionally
* disables interrupts for a long time. This call is stateless.
*/
-#ifdef ARCH_HAS_NMI_WATCHDOG
+#ifdef CONFIG_ARCH_NMI_WATCHDOG
extern void touch_nmi_watchdog(void);
#else
# define touch_nmi_watchdog() do { } while(0)
--- linux-2618-rc4-arch.orig/arch/i386/Kconfig
+++ linux-2618-rc4-arch/arch/i386/Kconfig
@@ -292,6 +292,10 @@ config X86_LOCAL_APIC
depends on X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER)
default y
+config ARCH_NMI_WATCHDOG
+ def_bool y
+ depends on X86_LOCAL_APIC
+
config X86_IO_APIC
bool
depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER))
--- linux-2618-rc4-arch.orig/arch/x86_64/Kconfig
+++ linux-2618-rc4-arch/arch/x86_64/Kconfig
@@ -213,6 +213,10 @@ config X86_LOCAL_APIC
bool
default y
+config ARCH_NMI_WATCHDOG
+ def_bool y
+ depends on X86_LOCAL_APIC
+
config MTRR
bool "MTRR (Memory Type Range Register) support"
---help---
---
next prev parent reply other threads:[~2006-08-07 21:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20060807120928.c0fe7045.rdunlap@xenotime.net>
2006-08-07 20:58 ` [PATCH 3/9] Replace ARCH_HAS_READ_CURRENT_TIMER with CONFIG_ARCH_READ_CURRENT_TIMER Randy.Dunlap
2006-08-07 21:00 ` Randy.Dunlap [this message]
2006-08-07 21:04 ` [PATCH 6/9] Replace ARCH_HAS_SOCKET_TYPES with CONFIG_ARCH_SOCKET_TYPES Randy.Dunlap
2006-08-07 21:05 ` [PATCH 7/9] Replace ARCH_HAS_VALID_PHYS_ADDR_RANGE with CONFIG_ARCH_VALID_PHYS_ADDR_RANGE Randy.Dunlap
2006-08-07 21:07 ` [PATCH 8/9] Replace __ARCH_HAS_NO_PAGE_ZERO_MAPPED with CONFIG_NO_PAGE_ZERO_MAPPED Randy.Dunlap
2006-08-07 21:09 ` [PATCH 9/9] Replace ARCH_HAS_POWER_INIT with CONFIG_ACPI_POWER_INIT Randy.Dunlap
2006-08-07 21:10 ` [PATCH 5/9] Replace ARCH_HAS_FLUSH_ANON_PAGE with CONFIG_ARCH_FLUSH_ANON_PAGE Randy.Dunlap
2006-08-08 8:52 ` Christoph Hellwig
2006-08-08 14:17 ` Kyle McMartin
2006-08-08 15:56 ` Randy.Dunlap
2006-08-07 21:11 ` [PATCH 2/9] Replace __ARCH_HAS_DO_SOFTIRQ with CONFIG_ARCH_DO_SOFTIRQ Randy.Dunlap
2006-08-08 8:29 ` Martin Schwidefsky
2006-08-07 21:12 ` [PATCH 1/9] Replace ARCH_HAS_SCHED_WAKE_IDLE with CONFIG_SCHED_SMT Randy.Dunlap
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=20060807140040.84f41ef1.rdunlap@xenotime.net \
--to=rdunlap@xenotime.net \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/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
all inboxes | Powered by JetHome®