sdei_watchdog: Fix compile error when PPC_WATCHDOG is disable on PowerPC
commit 0252aa08aafb4a40ea2d821f58e88e99a644b097 openeuler. When I compile the kernel with CONFIG_PPC_WATCHDOG is disabled on PowerPC, I got the following compile error: In file included from kernel/hung_task.c:11:0: ./include/linux/nmi.h: In function ‘touch_nmi_watchdog’: ./include/linux/nmi.h:143:2: error: implicit declaration of function ‘arch_touch_nmi_watchdog’; did you mean ‘touch_nmi_watchdog’? [-Werror=implicit-function-declaration] arch_touch_nmi_watchdog(); ^~~~~~~~~~~~~~~~~~~~~~~ touch_nmi_watchdog It is because CONFIG_HARDLOCKUP_DETECTOR_PERF is still enabled in my situation. Fix it by excluding arch_touch_nmi_watchdog() only when CONFIG_PPC_WATCHDOG is disabled. Signed-off-by: huwentao <huwentao19@h-partners.com>
This commit is contained in:
parent
e3a14898a3
commit
e26e124849
|
@ -96,7 +96,7 @@ static inline void hardlockup_detector_disable(void) {}
|
|||
#endif
|
||||
|
||||
#if defined(CONFIG_HARDLOCKUP_DETECTOR)
|
||||
#ifndef CONFIG_PPC
|
||||
#ifndef CONFIG_PPC_WATCHDOG
|
||||
extern void arch_touch_nmi_watchdog(void);
|
||||
#endif
|
||||
#else
|
||||
|
|
|
@ -26,8 +26,8 @@ static DEFINE_PER_CPU(bool, watchdog_nmi_touch);
|
|||
|
||||
static unsigned long hardlockup_allcpu_dumped;
|
||||
|
||||
#ifndef CONFIG_PPC
|
||||
notrace void __weak arch_touch_nmi_watchdog(void)
|
||||
#ifndef CONFIG_PPC_WATCHDOG
|
||||
notrace void arch_touch_nmi_watchdog(void)
|
||||
{
|
||||
/*
|
||||
* Using __raw here because some code paths have
|
||||
|
|
Loading…
Reference in New Issue