The patch titled
Replace ARCH_HAS_NMI_WATCHDOG with CONFIG_ARCH_NMI_WATCHDOG
has been added to the -mm tree. Its filename is
replace-arch_has_nmi_watchdog-with.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Replace ARCH_HAS_NMI_WATCHDOG with CONFIG_ARCH_NMI_WATCHDOG
From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Replace ARCH_HAS_NMI_WATCHDOG with CONFIG_ARCH_NMI_WATCHDOG. Move it from
header files to Kconfig space.
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/Kconfig | 4 ++++
arch/x86_64/Kconfig | 4 ++++
include/asm-i386/irq.h | 4 ----
include/asm-x86_64/irq.h | 2 --
include/linux/nmi.h | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
diff -puN arch/i386/Kconfig~replace-arch_has_nmi_watchdog-with arch/i386/Kconfig
--- a/arch/i386/Kconfig~replace-arch_has_nmi_watchdog-with
+++ a/arch/i386/Kconfig
@@ -291,6 +291,10 @@ config X86_LOCAL_APIC
depends on X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER) || X86_GENERICARCH
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)) || X86_GENERICARCH
diff -puN arch/x86_64/Kconfig~replace-arch_has_nmi_watchdog-with arch/x86_64/Kconfig
--- a/arch/x86_64/Kconfig~replace-arch_has_nmi_watchdog-with
+++ a/arch/x86_64/Kconfig
@@ -223,6 +223,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---
diff -puN include/asm-i386/irq.h~replace-arch_has_nmi_watchdog-with include/asm-i386/irq.h
--- a/include/asm-i386/irq.h~replace-arch_has_nmi_watchdog-with
+++ a/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);
diff -puN include/asm-x86_64/irq.h~replace-arch_has_nmi_watchdog-with include/asm-x86_64/irq.h
--- a/include/asm-x86_64/irq.h~replace-arch_has_nmi_watchdog-with
+++ a/include/asm-x86_64/irq.h
@@ -44,8 +44,6 @@ static __inline__ int irq_canonicalize(i
return ((irq == 2) ? 9 : irq);
}
-#define ARCH_HAS_NMI_WATCHDOG /* See include/linux/nmi.h */
-
#ifdef CONFIG_HOTPLUG_CPU
#include <linux/cpumask.h>
extern void fixup_irqs(cpumask_t map);
diff -puN include/linux/nmi.h~replace-arch_has_nmi_watchdog-with include/linux/nmi.h
--- a/include/linux/nmi.h~replace-arch_has_nmi_watchdog-with
+++ a/include/linux/nmi.h
@@ -14,7 +14,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() touch_softlockup_watchdog()
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are
acpi-bus-add-missing-newline.patch
acpi-handle-firmware_register-init-errors.patch
acpi-scan-handle-kset-kobject-errors.patch
acpi-fix-printk-format-warnings.patch
sysfs_remove_bin_file-no-return-value-dump_stack-on.patch
kobject-must_check-fixes.patch
drivers-base-check-errors.patch
sysfs-add-proper-sysfs_init-prototype.patch
bttv-must_check-fixes.patch
git-lxdialog.patch
pcmcia-ds-must_check-fixes.patch
libsas-externs-not-needed.patch
pcie-check-and-return-bus_register-errors.patch
pcie-check-and-return-bus_register-errors-fix.patch
git-scsi-misc.patch
aic7-cleanup-module_parm_desc-strings.patch
dc395x-fix-printk-format-warning.patch
add-kerneldocs-for-some-functions-in-mm-memoryc.patch
tiacx-sparse-cleanups.patch
consistently-use-max_errno-in-__syscall_return.patch
consistently-use-max_errno-in-__syscall_return-fix.patch
eisa-bus-modalias-attributes-support-1.patch
kernel-params-must_check-fixes.patch
blockdevc-check-errors.patch
block-handle-subsystem_register-init-errors.patch
fs-namespace-handle-init-registration-errors.patch
kernel-doc-for-relay-interface.patch
kernel-doc-fixes-for-debugfs.patch
kernel-doc-move-filesystems-together.patch
include-documentation-for-functions-in-drivers-base-classc.patch
fix-parameter-names-in-drivers-base-classc.patch
fix-kerneldoc-comments-in-kernel-timerc-fix.patch
replace-arch_has_sched_wake_idle-with-config_sched_smt.patch
replace-__arch_has_do_softirq-with.patch
replace-arch_has_read_current_timer-with.patch
replace-arch_has_nmi_watchdog-with.patch
replace-arch_has_flush_anon_page-with.patch
replace-arch_has_socket_types-with.patch
replace-arch_has_valid_phys_addr_range-with.patch
replace-__arch_has_no_page_zero_mapped-with.patch
replace-arch_has_power_init-with-config_acpi_power_init.patch
ecryptfs-fix-printk-format-warnings.patch
ide-core-must_check-fixes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
