From 5ecb5829ad934dcdb3bf1c9fb60b62db664363a6 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 14 May 2014 10:07:57 +1000 Subject: [PATCH] kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix additional CONFIG_SMP=n optimisations Cc: Aaron Tomlin Cc: David S. Miller Cc: Don Zickus Cc: Mateusz Guzik Cc: Oleg Nesterov Signed-off-by: Andrew Morton --- include/linux/nmi.h | 2 -- kernel/watchdog.c | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/linux/nmi.h b/include/linux/nmi.h index 961b1773c44d..447775ee2c4b 100644 --- a/include/linux/nmi.h +++ b/include/linux/nmi.h @@ -57,9 +57,7 @@ int hw_nmi_is_cpu_stuck(struct pt_regs *); u64 hw_nmi_get_sample_period(int watchdog_thresh); extern int watchdog_user_enabled; extern int watchdog_thresh; -#ifdef CONFIG_SMP extern int sysctl_softlockup_all_cpu_backtrace; -#endif struct ctl_table; extern int proc_dowatchdog(struct ctl_table *, int , void __user *, size_t *, loff_t *); diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 0e78f08a090d..bd77e97963a3 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -31,7 +31,12 @@ int watchdog_user_enabled = 1; int __read_mostly watchdog_thresh = 10; +#ifdef CONFIG_SMP int __read_mostly sysctl_softlockup_all_cpu_backtrace; +#else +#define sysctl_softlockup_all_cpu_backtrace 0 +#endif + static int __read_mostly watchdog_running; static u64 __read_mostly sample_period; -- 2.39.5