From 1572497cb0e6d2016078bc9d5a95786bb878389f Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 31 Jul 2018 13:39:30 +0200 Subject: kconfig: include common Kconfig files from top-level Kconfig Instead of duplicating the source statements in every architecture just do it once in the toplevel Kconfig file. Note that with this the inclusion of arch/$(SRCARCH/Kconfig moves out of the top-level Kconfig into arch/Kconfig so that don't violate ordering constraits while keeping a sensible menu structure. Signed-off-by: Christoph Hellwig Signed-off-by: Masahiro Yamada --- arch/arc/Kconfig | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'arch/arc') diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index e81bcd271be7..d4a28c45c406 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -94,9 +94,6 @@ config HAVE_ARCH_TRANSPARENT_HUGEPAGE def_bool y depends on ARC_MMU_V4 -source "init/Kconfig" -source "kernel/Kconfig.freezer" - menu "ARC Architecture Configuration" menu "ARC Platform/SoC/Board" @@ -550,22 +547,13 @@ config ARC_BUILTIN_DTB_NAME source "kernel/Kconfig.preempt" -menu "Executable file formats" -source "fs/Kconfig.binfmt" -endmenu - endmenu # "ARC Architecture Configuration" -source "mm/Kconfig" - config FORCE_MAX_ZONEORDER int "Maximum zone order" default "12" if ARC_HUGEPAGE_16M default "11" -source "net/Kconfig" -source "drivers/Kconfig" - menu "Bus Support" config PCI @@ -586,9 +574,5 @@ source "drivers/pci/Kconfig" endmenu -source "fs/Kconfig" source "arch/arc/Kconfig.debug" -source "security/Kconfig" -source "crypto/Kconfig" -source "lib/Kconfig" source "kernel/power/Kconfig" -- cgit v1.2.3 From 06ec64b84c357693e9a5540de8eedfc775dbae12 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 31 Jul 2018 13:39:31 +0200 Subject: 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 (limited to 'arch/arc') diff --git a/Kconfig b/Kconfig index 1a5c0a5d4ea1..a5997d6c2029 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 50676152babd..e4334f017f8e 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 5e93dffb818a..b88c7b641d72 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 d4a28c45c406..5aab069eba17 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 03da1a6b3072..45add86decd5 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 46ee6669204b..9aaa23c25374 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 693f84392f1b..b48dc083d1b1 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 fabd797c8645..07d457ec417a 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 cc6bd559af85..69c9170bdd24 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 441bbe089b96..904b3375331e 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 000000000000..c299e0d8eca3 --- /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 e23cd887f8f9..c16e7cf732f7 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 000000000000..22a162cd99e8 --- /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 d2851f46a64b..fcdb6d9fcecc 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 000000000000..22a162cd99e8 --- /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 6015d66fa521..34a8d24cffea 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 677c409425df..1371efc9b005 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 f76fb7bb371f..cf41ad45513f 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 04690b179a6e..f43643111eaf 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 fc31e047a43a..f4492e9478fe 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 93a737c8d1a6..dc2e3c45e8a2 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 f586a3259f7f..ab02824c3976 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 0749c3724543..0c86b2a2adfc 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 a9c6d25a14f0..c03d0e5a591b 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 000000000000..22a162cd99e8 --- /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 2d813dfdb8cb..22d19febcc92 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 edfeef049a51..7a49f0d28d14 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 eb9f503c8972..c52cecd94d62 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 000000000000..22a162cd99e8 --- /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 64b832a19bdf..d1dd56ea297b 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 fb3507f9b14a..1478ded0e247 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 131132f161e5..c55e61302d57 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 c45424c64e19..fd63cd914a74 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 082486cddf31..73c0e16793fa 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 000000000000..3224ff6ecf6e --- /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 a94667712337..ac8925766d0a 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 2cfdfbf8d320..190527560b2c 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 f291d2568cd4..c8460330eff7 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 d0767672640d..010b6c33bbba 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 8a1e44d2e112..622695e8fa44 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 4aef29a11925..50a918d496c8 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 a5cc2b19a960..3022d1bf9bf9 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 967d3109689f..2014597605ea 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 7fa7e61eb19f..6bfaa4a910e1 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 de8dae3abc0a..ca0ff97657ef 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 6faefd1c9f13..41d28b430fef 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 c6dd1d980081..7d68f0c7cfb1 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 d8bac8be3a33..aae0e1800be7 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 f64c14adadb3..39de98e20018 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 8838d1158d19..26d3ff7e3cf4 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 -- cgit v1.2.3 From 87a4c375995ed8eaa721b08825cf73d0b02b3145 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 31 Jul 2018 13:39:32 +0200 Subject: kconfig: include kernel/Kconfig.preempt from init/Kconfig Almost all architectures include it. Add a ARCH_NO_PREEMPT symbol to disable preempt support for alpha, hexagon, non-coldfire m68k and user mode Linux. Signed-off-by: Christoph Hellwig Signed-off-by: Masahiro Yamada --- arch/Kconfig | 3 +++ arch/alpha/Kconfig | 1 + arch/arc/Kconfig | 2 -- arch/arm/Kconfig | 2 -- arch/arm64/Kconfig | 1 - arch/c6x/Kconfig | 2 -- arch/h8300/Kconfig | 6 ------ arch/hexagon/Kconfig | 1 + arch/ia64/Kconfig | 2 -- arch/m68k/Kconfig | 5 +---- arch/microblaze/Kconfig | 2 -- arch/mips/Kconfig | 2 -- arch/nds32/Kconfig | 1 - arch/nios2/Kconfig | 2 -- arch/openrisc/Kconfig | 1 - arch/parisc/Kconfig | 1 - arch/powerpc/Kconfig | 1 - arch/riscv/Kconfig | 2 -- arch/s390/Kconfig | 2 -- arch/sh/Kconfig | 2 -- arch/sparc/Kconfig | 2 -- arch/um/Kconfig | 1 + arch/unicore32/Kconfig | 2 -- arch/x86/Kconfig | 2 -- arch/xtensa/Kconfig | 2 -- init/Kconfig | 1 + kernel/Kconfig.preempt | 2 ++ lib/Kconfig.debug | 1 + 28 files changed, 11 insertions(+), 43 deletions(-) (limited to 'arch/arc') diff --git a/arch/Kconfig b/arch/Kconfig index 09a561a70168..cddd0faae4cb 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -881,6 +881,9 @@ config COMPAT_32BIT_TIME config ARCH_NO_COHERENT_DMA_MMAP bool +config ARCH_NO_PREEMPT + bool + config CPU_NO_EFFICIENT_FFS def_bool n diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index e4334f017f8e..5b4f88363453 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -4,6 +4,7 @@ config ALPHA default y select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO + select ARCH_NO_PREEMPT select ARCH_USE_CMPXCHG_LOCKREF select HAVE_AOUT select HAVE_IDE diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 5aab069eba17..639ab1bed835 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -545,8 +545,6 @@ config ARC_BUILTIN_DTB_NAME Set the name of the DTB to embed in the vmlinux binary Leaving it blank selects the minimal "skeleton" dtb -source "kernel/Kconfig.preempt" - endmenu # "ARC Architecture Configuration" config FORCE_MAX_ZONEORDER diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9aaa23c25374..1b1c21519039 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1481,8 +1481,6 @@ config ARCH_NR_GPIO If unsure, leave the default value. -source kernel/Kconfig.preempt - config HZ_FIXED int default 200 if ARCH_EBSA110 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 07d457ec417a..daf59d363dd3 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -752,7 +752,6 @@ config HOLES_IN_ZONE def_bool y depends on NUMA -source kernel/Kconfig.preempt source kernel/Kconfig.hz config ARCH_SUPPORTS_DEBUG_PAGEALLOC diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig index 904b3375331e..a641b0bf1611 100644 --- a/arch/c6x/Kconfig +++ b/arch/c6x/Kconfig @@ -110,8 +110,6 @@ config KERNEL_RAM_BASE_ADDRESS default 0xe0000000 if SOC_TMS320C6472 default 0x80000000 -source "kernel/Kconfig.preempt" - source "kernel/Kconfig.hz" endmenu diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index c16e7cf732f7..5e89d40be8cd 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig @@ -49,9 +49,3 @@ config NR_CPUS default 1 source "arch/h8300/Kconfig.cpu" - -menu "Kernel Features" - -source "kernel/Kconfig.preempt" - -endmenu diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig index fcdb6d9fcecc..89a4b22f34d9 100644 --- a/arch/hexagon/Kconfig +++ b/arch/hexagon/Kconfig @@ -4,6 +4,7 @@ comment "Linux Kernel Configuration for Hexagon" config HEXAGON def_bool y + select ARCH_NO_PREEMPT select HAVE_OPROFILE # Other pending projects/to-do items. # select HAVE_REGS_AND_STACK_ACCESS_API diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 34a8d24cffea..86bd377bc7c0 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -364,8 +364,6 @@ config FORCE_CPEI_RETARGET This option it useful to enable this feature on older BIOS's as well. You can also enable this by using boot command line option force_cpei=1. -source "kernel/Kconfig.preempt" - config ARCH_SELECT_MEMORY_MODEL def_bool y diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index cf41ad45513f..3e47f8df6504 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -4,6 +4,7 @@ config M68K default y select ARCH_MIGHT_HAVE_PC_PARPORT if ISA select ARCH_NO_COHERENT_DMA_MMAP if !MMU + select ARCH_NO_PREEMPT if !COLDFIRE select HAVE_IDE select HAVE_AOUT if MMU select HAVE_DEBUG_BUGVERBOSE @@ -129,10 +130,6 @@ endmenu menu "Kernel Features" -if COLDFIRE -source "kernel/Kconfig.preempt" -endif - endmenu if !MMU diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index f4492e9478fe..6163a39ddeb6 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -87,8 +87,6 @@ source "arch/microblaze/Kconfig.platform" menu "Processor type and features" -source "kernel/Kconfig.preempt" - source "kernel/Kconfig.hz" config MMU diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index ab02824c3976..06a633eb9777 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -2818,8 +2818,6 @@ config HZ config SCHED_HRTICK def_bool HIGH_RES_TIMERS -source "kernel/Kconfig.preempt" - config KEXEC bool "Kexec system call" select KEXEC_CORE diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig index c03d0e5a591b..541f16adfb06 100644 --- a/arch/nds32/Kconfig +++ b/arch/nds32/Kconfig @@ -88,6 +88,5 @@ config NDS32_BUILTIN_DTB endmenu menu "Kernel Features" -source "kernel/Kconfig.preempt" source "kernel/Kconfig.hz" endmenu diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig index 22d19febcc92..cbe1844b0657 100644 --- a/arch/nios2/Kconfig +++ b/arch/nios2/Kconfig @@ -47,8 +47,6 @@ config TRACE_IRQFLAGS_SUPPORT menu "Kernel features" -source "kernel/Kconfig.preempt" - source "kernel/Kconfig.hz" config FORCE_MAX_ZONEORDER diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index c52cecd94d62..42e3a0f2afab 100644 --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig @@ -143,7 +143,6 @@ config SMP If you don't know what to do here, say N. source kernel/Kconfig.hz -source kernel/Kconfig.preempt config OPENRISC_NO_SPR_SR_DSX bool "use SPR_SR_DSX software emulation" if OR1K_1200 diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index d1dd56ea297b..89496aa318da 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -323,7 +323,6 @@ config NODES_SHIFT default "3" depends on NEED_MULTIPLE_NODES -source "kernel/Kconfig.preempt" source "kernel/Kconfig.hz" config COMPAT diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index c55e61302d57..1c10ff0406f2 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -393,7 +393,6 @@ config HIGHMEM depends on PPC32 source kernel/Kconfig.hz -source kernel/Kconfig.preempt config HUGETLB_PAGE_SIZE_VARIABLE bool diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 73c0e16793fa..a344980287a5 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -212,8 +212,6 @@ endmenu menu "Kernel type" -source "kernel/Kconfig.preempt" - source "kernel/Kconfig.hz" endmenu diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index ac8925766d0a..8441bd8f7d70 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -511,8 +511,6 @@ config SCHED_TOPOLOGY making when dealing with machines that have multi-threading, multiple cores or multiple books. -source kernel/Kconfig.preempt - source kernel/Kconfig.hz config KEXEC diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index c8460330eff7..993f61a5961d 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -709,8 +709,6 @@ config HOTPLUG_CPU Say Y here to experiment with turning CPUs off and on. CPUs can be controlled through /sys/devices/system/cpu. -source "kernel/Kconfig.preempt" - config GUSA def_bool y depends on !SMP && SUPERH32 diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 622695e8fa44..2d58c26bff9a 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -349,8 +349,6 @@ config SCHED_MC making when dealing with multi-core CPU chips at a cost of slightly increased overhead in some places. If unsure say N here. -source "kernel/Kconfig.preempt" - config CMDLINE_BOOL bool "Default bootloader kernel arguments" depends on SPARC64 diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 3022d1bf9bf9..6b9938919f0b 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -6,6 +6,7 @@ config UML bool default y select ARCH_HAS_KCOV + select ARCH_NO_PREEMPT select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_SECCOMP_FILTER select HAVE_UID16 diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig index 6bfaa4a910e1..60eae744d8fd 100644 --- a/arch/unicore32/Kconfig +++ b/arch/unicore32/Kconfig @@ -135,8 +135,6 @@ endmenu menu "Kernel Features" -source "kernel/Kconfig.preempt" - source "kernel/Kconfig.hz" config LEDS diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 41d28b430fef..98fd04cfa995 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1039,8 +1039,6 @@ config SCHED_MC_PRIO If unsure say Y here. -source "kernel/Kconfig.preempt" - config UP_LATE_INIT def_bool y depends on !SMP && X86_LOCAL_APIC diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index aae0e1800be7..801491e98890 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -173,8 +173,6 @@ config XTENSA_UNALIGNED_USER Say Y here to enable unaligned memory access in user space. -source "kernel/Kconfig.preempt" - config HAVE_SMP bool "System Supports SMP (MX)" depends on XTENSA_VARIANT_CUSTOM diff --git a/init/Kconfig b/init/Kconfig index 283f6bc796b1..29bbad9338d6 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -326,6 +326,7 @@ config AUDIT_TREE source "kernel/irq/Kconfig" source "kernel/time/Kconfig" +source "kernel/Kconfig.preempt" menu "CPU/Task time and stats accounting" diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt index 3f9c97419f02..cd1655122ec0 100644 --- a/kernel/Kconfig.preempt +++ b/kernel/Kconfig.preempt @@ -18,6 +18,7 @@ config PREEMPT_NONE config PREEMPT_VOLUNTARY bool "Voluntary Kernel Preemption (Desktop)" + depends on !ARCH_NO_PREEMPT help This option reduces the latency of the kernel by adding more "explicit preemption points" to the kernel code. These new @@ -35,6 +36,7 @@ config PREEMPT_VOLUNTARY config PREEMPT bool "Preemptible Kernel (Low-Latency Desktop)" + depends on !ARCH_NO_PREEMPT select PREEMPT_COUNT select UNINLINE_SPIN_UNLOCK if !ARCH_INLINE_SPIN_UNLOCK help diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 26d3ff7e3cf4..373ce9fecd7e 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1195,6 +1195,7 @@ config DEBUG_ATOMIC_SLEEP bool "Sleep inside atomic section checking" select PREEMPT_COUNT depends on DEBUG_KERNEL + depends on !ARCH_NO_PREEMPT help If you say Y here, various routines which may sleep will become very noisy if they are called inside atomic sections: when a spinlock is -- cgit v1.2.3