diff options
| author | Don Zickus <dzickus@redhat.com> | 2010-02-06 05:47:05 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-08 10:29:03 +0300 |
| commit | 84e478c6f1eb9c4bfa1fff2f8108e9a061b46428 (patch) | |
| tree | 15be1e0d92d4439e49ecc98a504589dc596fc211 /arch/x86/kernel/apic/Makefile | |
| parent | 1fb9d6ad2766a1dd70d167552988375049a97f21 (diff) | |
| download | linux-84e478c6f1eb9c4bfa1fff2f8108e9a061b46428.tar.xz | |
nmi_watchdog: Config option to enable new nmi_watchdog
These are the bits that enable the new nmi_watchdog and safely
isolate the old nmi_watchdog. Only one or the other can run,
not both at the same time.
Signed-off-by: Don Zickus <dzickus@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: gorcunov@gmail.com
Cc: aris@redhat.com
Cc: peterz@infradead.org
LKML-Reference: <1265424425-31562-4-git-send-email-dzickus@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic/Makefile')
| -rw-r--r-- | arch/x86/kernel/apic/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/Makefile b/arch/x86/kernel/apic/Makefile index 565c1bfc507d..1a4512e48d24 100644 --- a/arch/x86/kernel/apic/Makefile +++ b/arch/x86/kernel/apic/Makefile @@ -2,7 +2,12 @@ # Makefile for local APIC drivers and for the IO-APIC code # -obj-$(CONFIG_X86_LOCAL_APIC) += apic.o apic_noop.o probe_$(BITS).o ipi.o nmi.o +obj-$(CONFIG_X86_LOCAL_APIC) += apic.o apic_noop.o probe_$(BITS).o ipi.o +ifneq ($(CONFIG_NMI_WATCHDOG),y) +obj-$(CONFIG_X86_LOCAL_APIC) += nmi.o +endif +obj-$(CONFIG_NMI_WATCHDOG) += hw_nmi.o + obj-$(CONFIG_X86_IO_APIC) += io_apic.o obj-$(CONFIG_SMP) += ipi.o |