• D
    lockup_detector: Cross arch compile fixes · cafcd80d
    Don Zickus 提交于
    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: NDon 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: NFrederic Weisbecker <fweisbec@gmail.com>
    cafcd80d
Makefile 681 字节