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 <hch@lst.de>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/Kconfig b/Kconfig
index 1a5c0a5d4ea1f6804cdcca5b811ca36a64cda148..a5997d6c20293c927ffcefaafa2363b5f66bb499 100644 (file)
--- 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 50676152babddf71a17974dc5b9368a07cab1554..e4334f017f8e3fd620f11bb7a91c398983b16dd9 100644 (file)
--- 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 5e93dffb818aceae9b840c13dd1116aac03d0abb..b88c7b641d726687585f2a297f40bd21d37da906 100644 (file)
--- 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 d4a28c45c40628b98766e1fbe9d03cf356ac7557..5aab069eba1731c1b5c369026c3284cd498fa430 100644 (file)
--- 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 03da1a6b307213e4d051b9a80a5ab758851944b5..45add86decd5c76d8e40c67957e02d65ad8ed3a7 100644 (file)
--- 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 46ee6669204b7ac7386bb5e32be533c69110024d..9aaa23c2537478f231e06d283538b6c530b3608f 100644 (file)
--- 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 693f84392f1ba0170cb8fb870b2ee9b8aa073d88..b48dc083d1b15ce052ecadad082dc5b33bbf30bf 100644 (file)
--- 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 fabd797c86457c4cb98bac826eccb662c38e1cad..07d457ec417a64cb15038725e1c7ff427ed8b8dc 100644 (file)
--- 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 cc6bd559af8598b38c5e773251d227abf10bbc96..69c9170bdd2462086813f5d080155358022439d0 100644 (file)
--- 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 441bbe089b9630baa8c3cfa55e216b4986390d88..904b3375331e1b93215996b8f06f79fd7c5838e1 100644 (file)
--- 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 (file)
index 0000000..c299e0d
--- /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 e23cd887f8f97f5d36ef466d8b5812096fd50382..c16e7cf732f713f99947d67bd895357aff7993b5 100644 (file)
--- 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 (file)
index 0000000..22a162c
--- /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 d2851f46a64b072e110bcc812a848d33b9c3d660..fcdb6d9fcecce9e515fbff1618a0d1683ecb40a9 100644 (file)
--- 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 (file)
index 0000000..22a162c
--- /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 6015d66fa52113f190dbc3b13b119cf60fd817b7..34a8d24cffea23931da6323ca910adb36c11bc62 100644 (file)
--- 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 677c409425df238cd51d6ca1eac259c9e14a2c94..1371efc9b0055e195fc92f3a8bf41ee8dd9cbee3 100644 (file)
--- 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 f76fb7bb371f7659e8e637d01de48de40dc3a509..cf41ad45513f270e5918fd2e6b52ac4ac986a9be 100644 (file)
--- 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 04690b179a6e27869ad7929adc50ec9238143976..f43643111eaf8f962b81c24a46d59d6bd1ca286a 100644 (file)
--- 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 fc31e047a43aa1fe7b9da3d36822c9cc5783b2d5..f4492e9478fee660adb2add8bccf437625fd0f8d 100644 (file)
--- 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 93a737c8d1a6448d5bb4dcb2d71c8d8b5241e0d7..dc2e3c45e8a247e08f330ce81792b439e5114d73 100644 (file)
--- 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 f586a3259f7f2a954b703a98615a6c483d818291..ab02824c3976d16b6a028187e089bd89b3144cf9 100644 (file)
--- 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 0749c3724543a7c5f40aa97761703201ed4c7733..0c86b2a2adfcc3532cfd1c1c60523e5260916ae7 100644 (file)
--- 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 a9c6d25a14f0c171cfcf96be9c40f79bbc017d8f..c03d0e5a591b6875674ec641b20850c81e71759e 100644 (file)
--- 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 (file)
index 0000000..22a162c
--- /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 2d813dfdb8cbdd0e4d782726e296cb3a75dda67a..22d19febcc92482547b12ef6c50315b38db9e84b 100644 (file)
--- 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 edfeef049a514ba0dfba66cedb9495524af98def..7a49f0d28d14c106ea9300c8e54ad18aa6471e0b 100644 (file)
--- 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 eb9f503c8972298b7eccae15f976e4c25e57ce04..c52cecd94d629e2b0ffc7b4d04eaca79a34e7ae4 100644 (file)
--- 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 (file)
index 0000000..22a162c
--- /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 64b832a19bdf1924cde1a2a18a45e8fca0e91913..d1dd56ea297bc65b38f52f969bb7e93febc58ee3 100644 (file)
--- 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 fb3507f9b14a6ab0eba94494189c0e4e92ab3e81..1478ded0e24725b7d711c2ebaa6290ee0f1cb07e 100644 (file)
--- 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 131132f161e507d8e23e5e56f3e8584a521261dc..c55e61302d57b0610b3595d786a04f7f006b6168 100644 (file)
--- 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 c45424c64e1963c3017981a601fb558be6686269..fd63cd914a74f9b883297edae6b4bb9aa15d8bba 100644 (file)
--- 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 082486cddf31bd3573f19d47c7bf5f302035a183..73c0e16793faa55f75690a28dd9f52bc13ef48ec 100644 (file)
--- 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 (file)
index 0000000..3224ff6
--- /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 a94667712337c2da050028421eebee94ba063815..ac8925766d0a91a2580dd93a38b9eb554154b889 100644 (file)
--- 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 2cfdfbf8d3209bb15a5b0232e2147d8f55e99eb9..190527560b2c333942f49b30f812a035ff8b00fc 100644 (file)
--- 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 f291d2568cd492edcfb49d11fc89f8d2c0d2fadc..c8460330eff752612bb8ab6a961b818e8d135e2a 100644 (file)
--- 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 d0767672640d87490f898fb77c23322ce7244f7a..010b6c33bbba278bf802c57abd49375b3efe44ae 100644 (file)
--- 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 8a1e44d2e1129a7897db319097d8d2a2b827247f..622695e8fa447e5712b4f482568cdfa7b65b6917 100644 (file)
--- 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 4aef29a119251d9b3ca509af72abaf92b826a0f9..50a918d496c836da796a0da768cd71aa892fd705 100644 (file)
--- 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 a5cc2b19a9603638a629aeedc2b0dcaa6777e352..3022d1bf9bf953e1fc159d18471291105f0a246e 100644 (file)
--- 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 967d3109689ffd3a4cc3100cc160912b1979aa0c..2014597605ea9cd24ff881370ce063ddb57992e0 100644 (file)
--- 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 7fa7e61eb19f3ce42343db7f6dce9cd1d4a0965f..6bfaa4a910e13501cce081d4564f0c54da227e0b 100644 (file)
--- 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 de8dae3abc0ad798cf5da0c40da80f9e25173fb9..ca0ff97657ef1675ce218ef2aec6d65e767784c5 100644 (file)
--- 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 6faefd1c9f132c3e7c9f2ba15b713541b7e6cab3..41d28b430fef53ba25257151dfd478f665d5fc69 100644 (file)
--- 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 c6dd1d9800818e1e847e4219e9a854c9f88c9542..7d68f0c7cfb1ef603f9791cd2154d217ce647beb 100644 (file)
--- 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 d8bac8be3a33d678b6ca9109fa5ce03d11e5f815..aae0e1800be73eb7a7b2287c7d37187980857066 100644 (file)
--- 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 f64c14adadb365ddebd758908df05c9fe2e20d93..39de98e20018179f9945df6e81632b785085d902 100644 (file)
--- 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 8838d1158d192bfafe61fc234480ad9c9a05971f..26d3ff7e3cf482935cd5dfef0b8febae424ada63 100644 (file)
--- 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