cafcd80d21
Combining the softlockup and hardlockup code causes watchdog.c to build even without the hardlockup detection support. So if an arch, that has the previous and the new nmi watchdog implementations cohabiting, wants to know if the generic one is in use, CONFIG_LOCKUP_DETECTOR is not a reliable check. We need to use CONFIG_HARDLOCKUP_DETECTOR instead. Fixes: kernel/built-in.o: In function `touch_nmi_watchdog': (.text+0x449bc): multiple definition of `touch_nmi_watchdog' arch/sparc/kernel/built-in.o:(.text+0x11b28): first defined here Signed-off-by: Don Zickus <dzickus@redhat.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Don Zickus <dzickus@redhat.com> Cc: Cyrill Gorcunov <gorcunov@gmail.com> LKML-Reference: <20100514151121.GR15159@redhat.com> [ use CONFIG_HARDLOCKUP_DETECTOR instead of CONFIG_PERF_EVENTS_NMI] Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
25 lines
681 B
Makefile
25 lines
681 B
Makefile
#
|
|
# 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
|
|
ifneq ($(CONFIG_HARDLOCKUP_DETECTOR),y)
|
|
obj-$(CONFIG_X86_LOCAL_APIC) += nmi.o
|
|
endif
|
|
obj-$(CONFIG_HARDLOCKUP_DETECTOR) += hw_nmi.o
|
|
|
|
obj-$(CONFIG_X86_IO_APIC) += io_apic.o
|
|
obj-$(CONFIG_SMP) += ipi.o
|
|
|
|
ifeq ($(CONFIG_X86_64),y)
|
|
obj-y += apic_flat_64.o
|
|
obj-$(CONFIG_X86_X2APIC) += x2apic_cluster.o
|
|
obj-$(CONFIG_X86_X2APIC) += x2apic_phys.o
|
|
obj-$(CONFIG_X86_UV) += x2apic_uv_x.o
|
|
endif
|
|
|
|
obj-$(CONFIG_X86_BIGSMP) += bigsmp_32.o
|
|
obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
|
|
obj-$(CONFIG_X86_ES7000) += es7000_32.o
|
|
obj-$(CONFIG_X86_SUMMIT) += summit_32.o
|