From: tip-bot for Peter Zijlstra <tipbot@zytor•com>
To: linux-tip-commits@vger•kernel.org
Cc: mingo@kernel•org, hpa@zytor•com, torvalds@linux-foundation•org,
peterz@infradead•org, sfr@canb•auug.org.au,
sachinp@linux•vnet.ibm.com, linux-kernel@vger•kernel.org,
linux-next@vger•kernel.org, mpe@ellerman•id.au,
tglx@linutronix•de, linuxppc-dev@lists•ozlabs.org,
abdhalee@linux•vnet.ibm.com
Subject: [tip:sched/core] watchdog/softlockup: Fix the SOFTLOCKUP_DETECTOR=n build
Date: Tue, 10 Jul 2018 09:00:55 -0700 [thread overview]
Message-ID: <tip-aef92a8bed25d03b8f03ce499a56e8e8e5e2c05e@git.kernel.org> (raw)
In-Reply-To: <20180710114210.GI2476@hirez.programming.kicks-ass.net>
Commit-ID: aef92a8bed25d03b8f03ce499a56e8e8e5e2c05e
Gitweb: https://git.kernel.org/tip/aef92a8bed25d03b8f03ce499a56e8e8e5e2c05e
Author: Peter Zijlstra <peterz@infradead•org>
AuthorDate: Tue, 10 Jul 2018 13:42:10 +0200
Committer: Ingo Molnar <mingo@kernel•org>
CommitDate: Tue, 10 Jul 2018 17:56:22 +0200
watchdog/softlockup: Fix the SOFTLOCKUP_DETECTOR=n build
I got confused by all the various CONFIG options here about and
conflated CONFIG_LOCKUP_DETECTOR and CONFIG_SOFTLOCKUP_DETECTOR.
This results in a build failure for:
CONFIG_LOCKUP_DETECTOR=y && CONFIG_SOFTLOCKUP_DETECTOR=n
As reported by Abdul.
Reported-and-tested-by: Abdul Haleem <abdhalee@linux•vnet.ibm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead•org>
Cc: Linus Torvalds <torvalds@linux-foundation•org>
Cc: Peter Zijlstra <peterz@infradead•org>
Cc: Thomas Gleixner <tglx@linutronix•de>
Cc: linux-next <linux-next@vger•kernel.org>
Cc: linuxppc-dev <linuxppc-dev@lists•ozlabs.org>
Cc: mpe <mpe@ellerman•id.au>
Cc: sachinp <sachinp@linux•vnet.ibm.com>
Cc: stephen Rothwell <sfr@canb•auug.org.au>
Fixes: 9cf57731b63e ("watchdog/softlockup: Replace "watchdog/%u" threads with cpu_stop_work")
Link: http://lkml.kernel.org/r/20180710114210.GI2476@hirez.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@kernel•org>
---
include/linux/nmi.h | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index 80664bbeca43..08f9247e9827 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -33,15 +33,10 @@ extern int sysctl_hardlockup_all_cpu_backtrace;
#define sysctl_hardlockup_all_cpu_backtrace 0
#endif /* !CONFIG_SMP */
-extern int lockup_detector_online_cpu(unsigned int cpu);
-extern int lockup_detector_offline_cpu(unsigned int cpu);
-
#else /* CONFIG_LOCKUP_DETECTOR */
static inline void lockup_detector_init(void) { }
static inline void lockup_detector_soft_poweroff(void) { }
static inline void lockup_detector_cleanup(void) { }
-#define lockup_detector_online_cpu NULL
-#define lockup_detector_offline_cpu NULL
#endif /* !CONFIG_LOCKUP_DETECTOR */
#ifdef CONFIG_SOFTLOCKUP_DETECTOR
@@ -50,12 +45,18 @@ extern void touch_softlockup_watchdog(void);
extern void touch_softlockup_watchdog_sync(void);
extern void touch_all_softlockup_watchdogs(void);
extern unsigned int softlockup_panic;
-#else
+
+extern int lockup_detector_online_cpu(unsigned int cpu);
+extern int lockup_detector_offline_cpu(unsigned int cpu);
+#else /* CONFIG_SOFTLOCKUP_DETECTOR */
static inline void touch_softlockup_watchdog_sched(void) { }
static inline void touch_softlockup_watchdog(void) { }
static inline void touch_softlockup_watchdog_sync(void) { }
static inline void touch_all_softlockup_watchdogs(void) { }
-#endif
+
+#define lockup_detector_online_cpu NULL
+#define lockup_detector_offline_cpu NULL
+#endif /* CONFIG_SOFTLOCKUP_DETECTOR */
#ifdef CONFIG_DETECT_HUNG_TASK
void reset_hung_task_detector(void);
prev parent reply other threads:[~2018-07-10 16:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-09 9:51 [next-20180709][bisected 9cf57731][ppc] build fail with ld: BFD version 2.26.1-1.fc25 assertion fail elf64-ppc.c:14734 Abdul Haleem
2018-07-09 11:47 ` Peter Zijlstra
2018-07-09 18:10 ` Abdul Haleem
2018-07-10 11:42 ` [PATCH] watchdog/softlockup: Fix SOFTLOCKUP_DETECTOR=n build Peter Zijlstra
2018-07-10 15:56 ` Ingo Molnar
2018-07-10 16:00 ` tip-bot for Peter Zijlstra [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-aef92a8bed25d03b8f03ce499a56e8e8e5e2c05e@git.kernel.org \
--to=tipbot@zytor$(echo .)com \
--cc=abdhalee@linux$(echo .)vnet.ibm.com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-tip-commits@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mingo@kernel$(echo .)org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=peterz@infradead$(echo .)org \
--cc=sachinp@linux$(echo .)vnet.ibm.com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox