Commit 67fca000 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by akpm

lib/Kconfig.debug: remove more CONFIG_..._VALUE indirections

As in "kernel/panic.c: remove CONFIG_PANIC_ON_OOPS_VALUE indirection",
use the IS_ENABLED() helper rather than having a hidden config option.

Link: https://lkml.kernel.org/r/20220321121301.1389693-1-linux@rasmusvillemoes.dkSigned-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent d4557fae
...@@ -73,7 +73,7 @@ static unsigned int __read_mostly sysctl_hung_task_all_cpu_backtrace; ...@@ -73,7 +73,7 @@ static unsigned int __read_mostly sysctl_hung_task_all_cpu_backtrace;
* hung task is detected: * hung task is detected:
*/ */
unsigned int __read_mostly sysctl_hung_task_panic = unsigned int __read_mostly sysctl_hung_task_panic =
CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE; IS_ENABLED(CONFIG_BOOTPARAM_HUNG_TASK_PANIC);
static int static int
hung_task_panic(struct notifier_block *this, unsigned long event, void *ptr) hung_task_panic(struct notifier_block *this, unsigned long event, void *ptr)
......
...@@ -57,7 +57,7 @@ int __read_mostly sysctl_hardlockup_all_cpu_backtrace; ...@@ -57,7 +57,7 @@ int __read_mostly sysctl_hardlockup_all_cpu_backtrace;
* Should we panic when a soft-lockup or hard-lockup occurs: * Should we panic when a soft-lockup or hard-lockup occurs:
*/ */
unsigned int __read_mostly hardlockup_panic = unsigned int __read_mostly hardlockup_panic =
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE; IS_ENABLED(CONFIG_BOOTPARAM_HARDLOCKUP_PANIC);
/* /*
* We may not want to enable hard lockup detection by default in all cases, * We may not want to enable hard lockup detection by default in all cases,
* for example when running the kernel as a guest on a hypervisor. In these * for example when running the kernel as a guest on a hypervisor. In these
...@@ -168,7 +168,7 @@ static struct cpumask watchdog_allowed_mask __read_mostly; ...@@ -168,7 +168,7 @@ static struct cpumask watchdog_allowed_mask __read_mostly;
/* Global variables, exported for sysctl */ /* Global variables, exported for sysctl */
unsigned int __read_mostly softlockup_panic = unsigned int __read_mostly softlockup_panic =
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE; IS_ENABLED(CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC);
static bool softlockup_initialized __read_mostly; static bool softlockup_initialized __read_mostly;
static u64 __read_mostly sample_period; static u64 __read_mostly sample_period;
......
...@@ -1071,13 +1071,6 @@ config BOOTPARAM_SOFTLOCKUP_PANIC ...@@ -1071,13 +1071,6 @@ config BOOTPARAM_SOFTLOCKUP_PANIC
Say N if unsure. Say N if unsure.
config BOOTPARAM_SOFTLOCKUP_PANIC_VALUE
int
depends on SOFTLOCKUP_DETECTOR
range 0 1
default 0 if !BOOTPARAM_SOFTLOCKUP_PANIC
default 1 if BOOTPARAM_SOFTLOCKUP_PANIC
config HARDLOCKUP_DETECTOR_PERF config HARDLOCKUP_DETECTOR_PERF
bool bool
select SOFTLOCKUP_DETECTOR select SOFTLOCKUP_DETECTOR
...@@ -1119,13 +1112,6 @@ config BOOTPARAM_HARDLOCKUP_PANIC ...@@ -1119,13 +1112,6 @@ config BOOTPARAM_HARDLOCKUP_PANIC
Say N if unsure. Say N if unsure.
config BOOTPARAM_HARDLOCKUP_PANIC_VALUE
int
depends on HARDLOCKUP_DETECTOR
range 0 1
default 0 if !BOOTPARAM_HARDLOCKUP_PANIC
default 1 if BOOTPARAM_HARDLOCKUP_PANIC
config DETECT_HUNG_TASK config DETECT_HUNG_TASK
bool "Detect Hung Tasks" bool "Detect Hung Tasks"
depends on DEBUG_KERNEL depends on DEBUG_KERNEL
...@@ -1173,13 +1159,6 @@ config BOOTPARAM_HUNG_TASK_PANIC ...@@ -1173,13 +1159,6 @@ config BOOTPARAM_HUNG_TASK_PANIC
Say N if unsure. Say N if unsure.
config BOOTPARAM_HUNG_TASK_PANIC_VALUE
int
depends on DETECT_HUNG_TASK
range 0 1
default 0 if !BOOTPARAM_HUNG_TASK_PANIC
default 1 if BOOTPARAM_HUNG_TASK_PANIC
config WQ_WATCHDOG config WQ_WATCHDOG
bool "Detect Workqueue Stalls" bool "Detect Workqueue Stalls"
depends on DEBUG_KERNEL depends on DEBUG_KERNEL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment