From: Randy Dunlap <[email protected]>
Replace ARCH_HAS_NMI_WATCHDOG with CONFIG_ARCH_NMI_WATCHDOG.
Move it from header files to Kconfig space.
Signed-off-by: Randy Dunlap <[email protected]>
---
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---
---
-
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/
[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]
