| Message ID | 20150413212048.0db6414f@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 7551e5692597..c69671c03c3b 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -793,7 +793,7 @@ u64 hw_nmi_get_sample_period(int watchdog_thresh) */ static int __init disable_hardlockup_detector(void) { - watchdog_enable_hardlockup_detector(false); + hardlockup_detector_disable(); return 0; }
Hi Andrew, After merging the akpm-current tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: arch/powerpc/kernel/setup_64.c: In function 'disable_hardlockup_detector': arch/powerpc/kernel/setup_64.c:796:2: error: implicit declaration of function 'watchdog_enable_hardlockup_detector' [-Werror=implicit-function-declaration] watchdog_enable_hardlockup_detector(false); ^ Caused by commit 069bb95b9e38 ("watchdog: introduce the hardlockup_detector_disable() function") interacting with commit c54b2bf1b5e9 ("powerpc: Add ppc64 hard lockup detector support") from the powerpc-mpe tree. I applied the following merge fix patch (hopefully that is all that is required): From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 13 Apr 2015 21:18:01 +1000 Subject: [PATCH] powerpc: merge fix for watchdog_enable_hardlockup_detector API change Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/powerpc/kernel/setup_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)