UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Xiongfeng Wang 2021-03-29 15:45:24 +08:00 committed by lcy
parent e3a14898a3
commit e26e124849
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/nmi.h
View File

@ -96,7 +96,7 @@ static inline void hardlockup_detector_disable(void) {}
#endif #endif
#if defined(CONFIG_HARDLOCKUP_DETECTOR) #if defined(CONFIG_HARDLOCKUP_DETECTOR)
#ifndef CONFIG_PPC #ifndef CONFIG_PPC_WATCHDOG
extern void arch_touch_nmi_watchdog(void); extern void arch_touch_nmi_watchdog(void);
#endif #endif
#else #else

4
kernel/watchdog_hld.c
View File

@ -26,8 +26,8 @@ static DEFINE_PER_CPU(bool, watchdog_nmi_touch);
static unsigned long hardlockup_allcpu_dumped; static unsigned long hardlockup_allcpu_dumped;
#ifndef CONFIG_PPC #ifndef CONFIG_PPC_WATCHDOG
notrace void __weak arch_touch_nmi_watchdog(void) notrace void arch_touch_nmi_watchdog(void)
{ {
/* /*
* Using __raw here because some code paths have * Using __raw here because some code paths have