From 06ec64b84c357693e9a5540de8eedfc775dbae12 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 31 Jul 2018 13:39:31 +0200 Subject: [PATCH] Kconfig: consolidate the "Kernel hacking" menu Move the source of lib/Kconfig.debug and arch/$(ARCH)/Kconfig.debug to the top-level Kconfig. For two architectures that means moving their arch-specific symbols in that menu into a new arch Kconfig.debug file, and for a few more creating a dummy file so that we can include it unconditionally. Also move the actual 'Kernel hacking' menu to lib/Kconfig.debug, where it belongs. Signed-off-by: Christoph Hellwig Signed-off-by: Masahiro Yamada --- Kconfig | 2 ++ arch/alpha/Kconfig | 2 -- arch/alpha/Kconfig.debug | 5 ---- arch/arc/Kconfig | 1 - arch/arc/Kconfig.debug | 5 ---- arch/arm/Kconfig | 2 -- arch/arm/Kconfig.debug | 5 ---- arch/arm64/Kconfig | 2 -- arch/arm64/Kconfig.debug | 5 ---- arch/c6x/Kconfig | 15 ------------ arch/c6x/Kconfig.debug | 10 ++++++++ arch/h8300/Kconfig | 6 ----- arch/h8300/Kconfig.debug | 1 + arch/hexagon/Kconfig | 4 ---- arch/hexagon/Kconfig.debug | 1 + arch/ia64/Kconfig | 2 -- arch/ia64/Kconfig.debug | 5 ---- arch/m68k/Kconfig | 2 -- arch/m68k/Kconfig.debug | 5 ---- arch/microblaze/Kconfig | 2 -- arch/microblaze/Kconfig.debug | 6 ----- arch/mips/Kconfig | 2 -- arch/mips/Kconfig.debug | 5 ---- arch/nds32/Kconfig | 4 ---- arch/nds32/Kconfig.debug | 1 + arch/nios2/Kconfig | 2 -- arch/nios2/Kconfig.debug | 5 ---- arch/openrisc/Kconfig | 6 ----- arch/openrisc/Kconfig.debug | 1 + arch/parisc/Kconfig | 2 -- arch/parisc/Kconfig.debug | 5 ---- arch/powerpc/Kconfig | 2 -- arch/powerpc/Kconfig.debug | 5 ---- arch/riscv/Kconfig | 45 ----------------------------------- arch/riscv/Kconfig.debug | 37 ++++++++++++++++++++++++++++ arch/s390/Kconfig | 2 -- arch/s390/Kconfig.debug | 5 ---- arch/sh/Kconfig | 2 -- arch/sh/Kconfig.debug | 5 ---- arch/sparc/Kconfig | 2 -- arch/sparc/Kconfig.debug | 5 ---- arch/um/Kconfig | 2 -- arch/um/Kconfig.debug | 5 ---- arch/unicore32/Kconfig | 2 -- arch/unicore32/Kconfig.debug | 5 ---- arch/x86/Kconfig | 2 -- arch/x86/Kconfig.debug | 5 ---- arch/xtensa/Kconfig | 2 -- arch/xtensa/Kconfig.debug | 5 ---- lib/Kconfig.debug | 6 +++++ 50 files changed, 59 insertions(+), 206 deletions(-) create mode 100644 arch/c6x/Kconfig.debug create mode 100644 arch/h8300/Kconfig.debug create mode 100644 arch/hexagon/Kconfig.debug create mode 100644 arch/nds32/Kconfig.debug create mode 100644 arch/openrisc/Kconfig.debug create mode 100644 arch/riscv/Kconfig.debug diff --git a/Kconfig b/Kconfig index 1a5c0a5d4ea1f6..a5997d6c20293c 100644 --- a/Kconfig +++ b/Kconfig @@ -30,3 +30,5 @@ source "security/Kconfig" source "crypto/Kconfig" source "lib/Kconfig" + +source "lib/Kconfig.debug" diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 50676152babddf..e4334f017f8e3f 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -710,8 +710,6 @@ config SRM_ENV endmenu -source "arch/alpha/Kconfig.debug" - # DUMMY_CONSOLE may be defined in drivers/video/console/Kconfig # but we also need it if VGA_HOSE is set config DUMMY_CONSOLE diff --git a/arch/alpha/Kconfig.debug b/arch/alpha/Kconfig.debug index 5e93dffb818ace..b88c7b641d7266 100644 --- a/arch/alpha/Kconfig.debug +++ b/arch/alpha/Kconfig.debug @@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -menu "Kernel hacking" - -source "lib/Kconfig.debug" config EARLY_PRINTK bool @@ -39,5 +36,3 @@ config MATHEMU This option is required for IEEE compliant floating point arithmetic on the Alpha. The only time you would ever not say Y is to say M in order to debug the code. Say Y unless you know what you are doing. - -endmenu diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index d4a28c45c40628..5aab069eba1731 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -574,5 +574,4 @@ source "drivers/pci/Kconfig" endmenu -source "arch/arc/Kconfig.debug" source "kernel/power/Kconfig" diff --git a/arch/arc/Kconfig.debug b/arch/arc/Kconfig.debug index 03da1a6b307213..45add86decd5c7 100644 --- a/arch/arc/Kconfig.debug +++ b/arch/arc/Kconfig.debug @@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -menu "Kernel hacking" - -source "lib/Kconfig.debug" config 16KSTACKS bool "Use 16Kb for kernel stacks instead of 8Kb" @@ -11,5 +8,3 @@ config 16KSTACKS This increases the resident kernel footprint and will cause less threads to run on the system and also increase the pressure on the VM subsystem for higher order allocations. - -endmenu diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 46ee6669204b7a..9aaa23c2537478 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2191,8 +2191,6 @@ endmenu source "drivers/firmware/Kconfig" -source "arch/arm/Kconfig.debug" - if CRYPTO source "arch/arm/crypto/Kconfig" endif diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 693f84392f1ba0..b48dc083d1b15c 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -menu "Kernel hacking" - -source "lib/Kconfig.debug" config ARM_PTDUMP_CORE def_bool n @@ -1863,5 +1860,3 @@ config PID_IN_CONTEXTIDR are planning to use hardware trace tools with this kernel. source "drivers/hwtracing/coresight/Kconfig" - -endmenu diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index fabd797c86457c..07d457ec417a64 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1321,8 +1321,6 @@ source "drivers/acpi/Kconfig" source "arch/arm64/kvm/Kconfig" -source "arch/arm64/Kconfig.debug" - if CRYPTO source "arch/arm64/crypto/Kconfig" endif diff --git a/arch/arm64/Kconfig.debug b/arch/arm64/Kconfig.debug index cc6bd559af8598..69c9170bdd2462 100644 --- a/arch/arm64/Kconfig.debug +++ b/arch/arm64/Kconfig.debug @@ -1,6 +1,3 @@ -menu "Kernel hacking" - -source "lib/Kconfig.debug" config ARM64_PTDUMP_CORE def_bool n @@ -97,5 +94,3 @@ config ARM64_RELOC_TEST tristate "Relocation testing module" source "drivers/hwtracing/coresight/Kconfig" - -endmenu diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig index 441bbe089b9630..904b3375331e1b 100644 --- a/arch/c6x/Kconfig +++ b/arch/c6x/Kconfig @@ -115,18 +115,3 @@ source "kernel/Kconfig.preempt" source "kernel/Kconfig.hz" endmenu - -menu "Kernel hacking" - -source "lib/Kconfig.debug" - -config ACCESS_CHECK - bool "Check the user pointer address" - default y - help - Usually the pointer transfer from user space is checked to see if its - address is in the kernel space. - - Say N here to disable that check to improve the performance. - -endmenu diff --git a/arch/c6x/Kconfig.debug b/arch/c6x/Kconfig.debug new file mode 100644 index 00000000000000..c299e0d8eca341 --- /dev/null +++ b/arch/c6x/Kconfig.debug @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0 + +config ACCESS_CHECK + bool "Check the user pointer address" + default y + help + Usually the pointer transfer from user space is checked to see if its + address is in the kernel space. + + Say N here to disable that check to improve the performance. diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index e23cd887f8f97f..c16e7cf732f713 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig @@ -55,9 +55,3 @@ menu "Kernel Features" source "kernel/Kconfig.preempt" endmenu - -menu "Kernel hacking" - -source "lib/Kconfig.debug" - -endmenu diff --git a/arch/h8300/Kconfig.debug b/arch/h8300/Kconfig.debug new file mode 100644 index 00000000000000..22a162cd99e811 --- /dev/null +++ b/arch/h8300/Kconfig.debug @@ -0,0 +1 @@ +# dummy file, do not delete diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig index d2851f46a64b07..fcdb6d9fcecce9 100644 --- a/arch/hexagon/Kconfig +++ b/arch/hexagon/Kconfig @@ -149,7 +149,3 @@ endchoice source "kernel/Kconfig.hz" endmenu - -menu "Kernel hacking" -source "lib/Kconfig.debug" -endmenu diff --git a/arch/hexagon/Kconfig.debug b/arch/hexagon/Kconfig.debug new file mode 100644 index 00000000000000..22a162cd99e811 --- /dev/null +++ b/arch/hexagon/Kconfig.debug @@ -0,0 +1 @@ +# dummy file, do not delete diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 6015d66fa52113..34a8d24cffea23 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -576,5 +576,3 @@ config MSPEC If you have an ia64 and you want to enable memory special operations support (formerly known as fetchop), say Y here, otherwise say N. - -source "arch/ia64/Kconfig.debug" diff --git a/arch/ia64/Kconfig.debug b/arch/ia64/Kconfig.debug index 677c409425df23..1371efc9b0055e 100644 --- a/arch/ia64/Kconfig.debug +++ b/arch/ia64/Kconfig.debug @@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -menu "Kernel hacking" - -source "lib/Kconfig.debug" choice prompt "Physical memory granularity" @@ -56,5 +53,3 @@ config IA64_DEBUG_IRQ Selecting this option turns on bug checking for the IA-64 irq_save and restore instructions. It's useful for tracking down spinlock problems, but slow! If you're unsure, select N. - -endmenu diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index f76fb7bb371f76..cf41ad45513f27 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -147,5 +147,3 @@ endmenu endif source "arch/m68k/Kconfig.devices" - -source "arch/m68k/Kconfig.debug" diff --git a/arch/m68k/Kconfig.debug b/arch/m68k/Kconfig.debug index 04690b179a6e27..f43643111eaf8f 100644 --- a/arch/m68k/Kconfig.debug +++ b/arch/m68k/Kconfig.debug @@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -menu "Kernel hacking" - -source "lib/Kconfig.debug" config BOOTPARAM bool 'Compiled-in Kernel Boot Parameter' @@ -51,5 +48,3 @@ config BDM_DISABLE Disable the ColdFire CPU's BDM signals. endif - -endmenu diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index fc31e047a43aa1..f4492e9478fee6 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -285,5 +285,3 @@ config PCI_XILINX source "drivers/pci/Kconfig" endmenu - -source "arch/microblaze/Kconfig.debug" diff --git a/arch/microblaze/Kconfig.debug b/arch/microblaze/Kconfig.debug index 93a737c8d1a644..dc2e3c45e8a247 100644 --- a/arch/microblaze/Kconfig.debug +++ b/arch/microblaze/Kconfig.debug @@ -1,11 +1,5 @@ # For a description of the syntax of this configuration file, # see Documentation/kbuild/kconfig-language.txt. -menu "Kernel hacking" - config TRACE_IRQFLAGS_SUPPORT def_bool y - -source "lib/Kconfig.debug" - -endmenu diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index f586a3259f7f2a..ab02824c3976d1 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -3195,6 +3195,4 @@ endmenu source "drivers/firmware/Kconfig" -source "arch/mips/Kconfig.debug" - source "arch/mips/kvm/Kconfig" diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug index 0749c3724543a7..0c86b2a2adfcc3 100644 --- a/arch/mips/Kconfig.debug +++ b/arch/mips/Kconfig.debug @@ -1,12 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 -menu "Kernel hacking" config TRACE_IRQFLAGS_SUPPORT bool default y -source "lib/Kconfig.debug" - config EARLY_PRINTK bool "Early printk" if EXPERT depends on SYS_HAS_EARLY_PRINTK @@ -155,5 +152,3 @@ config MIPS_CPS_NS16550_SHIFT adjacent ns16550 registers in the system. endif # MIPS_CPS_NS16550_BOOL - -endmenu diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig index a9c6d25a14f0c1..c03d0e5a591b68 100644 --- a/arch/nds32/Kconfig +++ b/arch/nds32/Kconfig @@ -91,7 +91,3 @@ menu "Kernel Features" source "kernel/Kconfig.preempt" source "kernel/Kconfig.hz" endmenu - -menu "Kernel hacking" -source "lib/Kconfig.debug" -endmenu diff --git a/arch/nds32/Kconfig.debug b/arch/nds32/Kconfig.debug new file mode 100644 index 00000000000000..22a162cd99e811 --- /dev/null +++ b/arch/nds32/Kconfig.debug @@ -0,0 +1 @@ +# dummy file, do not delete diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig index 2d813dfdb8cbdd..22d19febcc9248 100644 --- a/arch/nios2/Kconfig +++ b/arch/nios2/Kconfig @@ -187,5 +187,3 @@ config NIOS2_IO_REGION_BASE default "0xe0000000" endmenu - -source "arch/nios2/Kconfig.debug" diff --git a/arch/nios2/Kconfig.debug b/arch/nios2/Kconfig.debug index edfeef049a514b..7a49f0d28d14c1 100644 --- a/arch/nios2/Kconfig.debug +++ b/arch/nios2/Kconfig.debug @@ -1,11 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 -menu "Kernel hacking" config TRACE_IRQFLAGS_SUPPORT def_bool y -source "lib/Kconfig.debug" - config DEBUG_STACK_USAGE bool "Enable stack utilization instrumentation" depends on DEBUG_KERNEL @@ -24,5 +21,3 @@ config EARLY_PRINTK This is useful for kernel debugging when your machine crashes very early before the console code is initialized. You should normally say N here, unless you want to debug such a crash. - -endmenu diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index eb9f503c897229..c52cecd94d629e 100644 --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig @@ -201,9 +201,3 @@ config OPENRISC_ESR_EXCEPTION_BUG_CHECK endmenu endmenu - -menu "Kernel hacking" - -source "lib/Kconfig.debug" - -endmenu diff --git a/arch/openrisc/Kconfig.debug b/arch/openrisc/Kconfig.debug new file mode 100644 index 00000000000000..22a162cd99e811 --- /dev/null +++ b/arch/openrisc/Kconfig.debug @@ -0,0 +1 @@ +# dummy file, do not delete diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 64b832a19bdf19..d1dd56ea297bc6 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -349,8 +349,6 @@ endmenu source "drivers/parisc/Kconfig" -source "arch/parisc/Kconfig.debug" - config SECCOMP def_bool y prompt "Enable seccomp to safely compute untrusted bytecode" diff --git a/arch/parisc/Kconfig.debug b/arch/parisc/Kconfig.debug index fb3507f9b14a6a..1478ded0e24725 100644 --- a/arch/parisc/Kconfig.debug +++ b/arch/parisc/Kconfig.debug @@ -1,9 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -menu "Kernel hacking" - -source "lib/Kconfig.debug" config TRACE_IRQFLAGS_SUPPORT def_bool y - -endmenu diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 131132f161e507..c55e61302d57b0 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -1194,8 +1194,6 @@ endif config ARCH_RANDOM def_bool n -source "arch/powerpc/Kconfig.debug" - config PPC_LIB_RHEAP bool diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug index c45424c64e1963..fd63cd914a74f9 100644 --- a/arch/powerpc/Kconfig.debug +++ b/arch/powerpc/Kconfig.debug @@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -menu "Kernel hacking" - -source "lib/Kconfig.debug" config PPC_DISABLE_WERROR bool "Don't build arch/powerpc code with -Werror" @@ -379,5 +376,3 @@ config PPC_FAST_ENDIAN_SWITCH depends on DEBUG_KERNEL && PPC_BOOK3S_64 help If you're unsure what this is, say N. - -endmenu diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 082486cddf31bd..73c0e16793faa5 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -245,48 +245,3 @@ menu "Power management options" source kernel/power/Kconfig endmenu - -menu "Kernel hacking" - -config CMDLINE_BOOL - bool "Built-in kernel command line" - help - For most platforms, it is firmware or second stage bootloader - that by default specifies the kernel command line options. - However, it might be necessary or advantageous to either override - the default kernel command line or add a few extra options to it. - For such cases, this option allows hardcoding command line options - directly into the kernel. - - For that, choose 'Y' here and fill in the extra boot parameters - in CONFIG_CMDLINE. - - The built-in options will be concatenated to the default command - line if CMDLINE_FORCE is set to 'N'. Otherwise, the default - command line will be ignored and replaced by the built-in string. - -config CMDLINE - string "Built-in kernel command string" - depends on CMDLINE_BOOL - default "" - help - Supply command-line options at build time by entering them here. - -config CMDLINE_FORCE - bool "Built-in command line overrides bootloader arguments" - depends on CMDLINE_BOOL - help - Set this option to 'Y' to have the kernel ignore the bootloader - or firmware command line. Instead, the built-in command line - will be used exclusively. - - If you don't know what to do here, say N. - -config EARLY_PRINTK - def_bool y - -source "lib/Kconfig.debug" - -config CMDLINE_BOOL - bool -endmenu diff --git a/arch/riscv/Kconfig.debug b/arch/riscv/Kconfig.debug new file mode 100644 index 00000000000000..3224ff6ecf6e38 --- /dev/null +++ b/arch/riscv/Kconfig.debug @@ -0,0 +1,37 @@ + +config CMDLINE_BOOL + bool "Built-in kernel command line" + help + For most platforms, it is firmware or second stage bootloader + that by default specifies the kernel command line options. + However, it might be necessary or advantageous to either override + the default kernel command line or add a few extra options to it. + For such cases, this option allows hardcoding command line options + directly into the kernel. + + For that, choose 'Y' here and fill in the extra boot parameters + in CONFIG_CMDLINE. + + The built-in options will be concatenated to the default command + line if CMDLINE_FORCE is set to 'N'. Otherwise, the default + command line will be ignored and replaced by the built-in string. + +config CMDLINE + string "Built-in kernel command string" + depends on CMDLINE_BOOL + default "" + help + Supply command-line options at build time by entering them here. + +config CMDLINE_FORCE + bool "Built-in command line overrides bootloader arguments" + depends on CMDLINE_BOOL + help + Set this option to 'Y' to have the kernel ignore the bootloader + or firmware command line. Instead, the built-in command line + will be used exclusively. + + If you don't know what to do here, say N. + +config EARLY_PRINTK + def_bool y diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index a94667712337c2..ac8925766d0a91 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -828,8 +828,6 @@ config HAVE_PNETID tristate default (SMC || CCWGROUP) -source "arch/s390/Kconfig.debug" - menu "Virtualization" config PFAULT diff --git a/arch/s390/Kconfig.debug b/arch/s390/Kconfig.debug index 2cfdfbf8d3209b..190527560b2c33 100644 --- a/arch/s390/Kconfig.debug +++ b/arch/s390/Kconfig.debug @@ -1,11 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 -menu "Kernel hacking" config TRACE_IRQFLAGS_SUPPORT def_bool y -source "lib/Kconfig.debug" - config S390_PTDUMP bool "Export kernel pagetable layout to userspace via debugfs" depends on DEBUG_KERNEL @@ -20,5 +17,3 @@ config S390_PTDUMP config EARLY_PRINTK def_bool y - -endmenu diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index f291d2568cd492..c8460330eff752 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -885,5 +885,3 @@ source "kernel/power/Kconfig" source "drivers/cpuidle/Kconfig" endmenu - -source "arch/sh/Kconfig.debug" diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug index d0767672640d87..010b6c33bbba27 100644 --- a/arch/sh/Kconfig.debug +++ b/arch/sh/Kconfig.debug @@ -1,11 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 -menu "Kernel hacking" config TRACE_IRQFLAGS_SUPPORT def_bool y -source "lib/Kconfig.debug" - config SH_STANDARD_BIOS bool "Use LinuxSH standard BIOS" depends on SUPERH32 @@ -88,5 +85,3 @@ config MCOUNT def_bool y depends on SUPERH32 depends on STACK_DEBUG || FUNCTION_TRACER - -endmenu diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 8a1e44d2e1129a..622695e8fa447e 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -565,5 +565,3 @@ config SYSVIPC_COMPAT default y source "drivers/sbus/char/Kconfig" - -source "arch/sparc/Kconfig.debug" diff --git a/arch/sparc/Kconfig.debug b/arch/sparc/Kconfig.debug index 4aef29a119251d..50a918d496c836 100644 --- a/arch/sparc/Kconfig.debug +++ b/arch/sparc/Kconfig.debug @@ -1,12 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 -menu "Kernel hacking" config TRACE_IRQFLAGS_SUPPORT bool default y -source "lib/Kconfig.debug" - config DEBUG_DCFLUSH bool "D-cache flush debugging" depends on SPARC64 && DEBUG_KERNEL @@ -21,5 +18,3 @@ config FRAME_POINTER bool depends on MCOUNT default y - -endmenu diff --git a/arch/um/Kconfig b/arch/um/Kconfig index a5cc2b19a96036..3022d1bf9bf953 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -187,5 +187,3 @@ config SECCOMP endmenu source "arch/um/drivers/Kconfig" - -source "arch/um/Kconfig.debug" diff --git a/arch/um/Kconfig.debug b/arch/um/Kconfig.debug index 967d3109689ffd..2014597605ea9c 100644 --- a/arch/um/Kconfig.debug +++ b/arch/um/Kconfig.debug @@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -menu "Kernel hacking" - -source "lib/Kconfig.debug" config GPROF bool "Enable gprof support" @@ -37,5 +34,3 @@ config EARLY_PRINTK This is useful for kernel debugging when your machine crashes very early before the console code is initialized. - -endmenu diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig index 7fa7e61eb19f3c..6bfaa4a910e135 100644 --- a/arch/unicore32/Kconfig +++ b/arch/unicore32/Kconfig @@ -222,5 +222,3 @@ endmenu endif endif - -source "arch/unicore32/Kconfig.debug" diff --git a/arch/unicore32/Kconfig.debug b/arch/unicore32/Kconfig.debug index de8dae3abc0ad7..ca0ff97657ef16 100644 --- a/arch/unicore32/Kconfig.debug +++ b/arch/unicore32/Kconfig.debug @@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -menu "Kernel hacking" - -source "lib/Kconfig.debug" config EARLY_PRINTK def_bool DEBUG_OCD @@ -30,5 +27,3 @@ config DEBUG_OCD help Say Y here if you want the debug print routines to direct their output to the UniCore On-Chip-Debugger channel using CP #1. - -endmenu diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 6faefd1c9f132c..41d28b430fef53 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2931,6 +2931,4 @@ config HAVE_GENERIC_GUP source "drivers/firmware/Kconfig" -source "arch/x86/Kconfig.debug" - source "arch/x86/kvm/Kconfig" diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index c6dd1d9800818e..7d68f0c7cfb1ef 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug @@ -1,11 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 -menu "Kernel hacking" config TRACE_IRQFLAGS_SUPPORT def_bool y -source "lib/Kconfig.debug" - config EARLY_PRINTK_USB bool @@ -410,5 +407,3 @@ endchoice config FRAME_POINTER depends on !UNWINDER_ORC && !UNWINDER_GUESS bool - -endmenu diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index d8bac8be3a33d6..aae0e1800be73e 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -567,5 +567,3 @@ menu "Power management options" source "kernel/power/Kconfig" endmenu - -source "arch/xtensa/Kconfig.debug" diff --git a/arch/xtensa/Kconfig.debug b/arch/xtensa/Kconfig.debug index f64c14adadb365..39de98e2001817 100644 --- a/arch/xtensa/Kconfig.debug +++ b/arch/xtensa/Kconfig.debug @@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -menu "Kernel hacking" - -source "lib/Kconfig.debug" config DEBUG_TLB_SANITY bool "Debug TLB sanity" @@ -34,5 +31,3 @@ config S32C1I_SELFTEST It is easy to make wrong hardware configuration, this test should catch it early. Say 'N' on stable hardware. - -endmenu diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 8838d1158d192b..26d3ff7e3cf482 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1,3 +1,5 @@ +menu "Kernel hacking" + menu "printk and dmesg options" config PRINTK_TIME @@ -2034,3 +2036,7 @@ config IO_STRICT_DEVMEM if the driver using a given range cannot be disabled. If in doubt, say Y. + +source "arch/$(SRCARCH)/Kconfig.debug" + +endmenu # Kernel hacking