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.dk
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/kernel/hung_task.c b/kernel/hung_task.c
index 52501e5f765547e0fa83824c5777ad7d45cce077..cff3ae8c818fd323d611b0845afeea6d958ee94c 100644 (file)
--- a/kernel/hung_task.c
+++ b/kernel/hung_task.c
@@ -73,7 +73,7 @@ static unsigned int __read_mostly sysctl_hung_task_all_cpu_backtrace;
  * hung task is detected:
  */
 unsigned int __read_mostly sysctl_hung_task_panic =
-                               CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE;
+                               IS_ENABLED(CONFIG_BOOTPARAM_HUNG_TASK_PANIC);
 
 static int
 hung_task_panic(struct notifier_block *this, unsigned long event, void *ptr)

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 9166220457bcbbf12852a591d617b442da3b2c37..ecb0e8346e6534901bb6c94bec71e7e92baa104c 100644 (file)
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -57,7 +57,7 @@ int __read_mostly sysctl_hardlockup_all_cpu_backtrace;
  * Should we panic when a soft-lockup or hard-lockup occurs:
  */
 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,
  * 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;
 
 /* Global variables, exported for sysctl */
 unsigned int __read_mostly softlockup_panic =
-                       CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE;
+                       IS_ENABLED(CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC);
 
 static bool softlockup_initialized __read_mostly;
 static u64 __read_mostly sample_period;

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 075cd25363ac38ea7cc126dac79c9c0b40145bf8..8fa08100dbd8a0a8d05dd8e50a89886687a8bb46 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1071,13 +1071,6 @@ config BOOTPARAM_SOFTLOCKUP_PANIC
 
          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
        bool
        select SOFTLOCKUP_DETECTOR
@@ -1119,13 +1112,6 @@ config BOOTPARAM_HARDLOCKUP_PANIC
 
          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
        bool "Detect Hung Tasks"
        depends on DEBUG_KERNEL
@@ -1173,13 +1159,6 @@ config BOOTPARAM_HUNG_TASK_PANIC
 
          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
        bool "Detect Workqueue Stalls"
        depends on DEBUG_KERNEL