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 <hch@lst.de>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Christoph Hellwig 2018-07-31 13:39:30 +02:00 committed by Masahiro Yamada
parent 17c46a6aff
commit 1572497cb0
28 changed files with 30 additions and 533 deletions

22
Kconfig
View File

@ -9,4 +9,24 @@ comment "Compiler: $(CC_VERSION_TEXT)"
source "scripts/Kconfig.include" source "scripts/Kconfig.include"
source "arch/$(SRCARCH)/Kconfig" source "init/Kconfig"
source "kernel/Kconfig.freezer"
menu "Executable file formats"
source "fs/Kconfig.binfmt"
endmenu
source "mm/Kconfig"
source "net/Kconfig"
source "drivers/Kconfig"
source "fs/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"

View File

@ -3,6 +3,12 @@
# General architecture dependent options # General architecture dependent options
# #
#
# Note: arch/$(SRCARCH)/Kconfig needs to be included first so that it can
# override the default values in this file.
#
source "arch/$(SRCARCH)/Kconfig"
config CRASH_CORE config CRASH_CORE
bool bool

View File

@ -74,9 +74,6 @@ config PGTABLE_LEVELS
int int
default 3 default 3
source "init/Kconfig"
source "kernel/Kconfig.freezer"
config AUDIT_ARCH config AUDIT_ARCH
bool bool
@ -573,8 +570,6 @@ config ARCH_DISCONTIGMEM_ENABLE
or have huge holes in the physical address space for other reasons. or have huge holes in the physical address space for other reasons.
See <file:Documentation/vm/numa.rst> for more. See <file:Documentation/vm/numa.rst> for more.
source "mm/Kconfig"
config NUMA config NUMA
bool "NUMA Support (EXPERIMENTAL)" bool "NUMA Support (EXPERIMENTAL)"
depends on DISCONTIGMEM && BROKEN depends on DISCONTIGMEM && BROKEN
@ -713,16 +708,8 @@ config SRM_ENV
This driver is also available as a module and will be called This driver is also available as a module and will be called
srm_env then. srm_env then.
source "fs/Kconfig.binfmt"
endmenu endmenu
source "net/Kconfig"
source "drivers/Kconfig"
source "fs/Kconfig"
source "arch/alpha/Kconfig.debug" source "arch/alpha/Kconfig.debug"
# DUMMY_CONSOLE may be defined in drivers/video/console/Kconfig # DUMMY_CONSOLE may be defined in drivers/video/console/Kconfig
@ -731,10 +718,3 @@ config DUMMY_CONSOLE
bool bool
depends on VGA_HOSE depends on VGA_HOSE
default y default y
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"

View File

@ -94,9 +94,6 @@ config HAVE_ARCH_TRANSPARENT_HUGEPAGE
def_bool y def_bool y
depends on ARC_MMU_V4 depends on ARC_MMU_V4
source "init/Kconfig"
source "kernel/Kconfig.freezer"
menu "ARC Architecture Configuration" menu "ARC Architecture Configuration"
menu "ARC Platform/SoC/Board" menu "ARC Platform/SoC/Board"
@ -550,22 +547,13 @@ config ARC_BUILTIN_DTB_NAME
source "kernel/Kconfig.preempt" source "kernel/Kconfig.preempt"
menu "Executable file formats"
source "fs/Kconfig.binfmt"
endmenu
endmenu # "ARC Architecture Configuration" endmenu # "ARC Architecture Configuration"
source "mm/Kconfig"
config FORCE_MAX_ZONEORDER config FORCE_MAX_ZONEORDER
int "Maximum zone order" int "Maximum zone order"
default "12" if ARC_HUGEPAGE_16M default "12" if ARC_HUGEPAGE_16M
default "11" default "11"
source "net/Kconfig"
source "drivers/Kconfig"
menu "Bus Support" menu "Bus Support"
config PCI config PCI
@ -586,9 +574,5 @@ source "drivers/pci/Kconfig"
endmenu endmenu
source "fs/Kconfig"
source "arch/arc/Kconfig.debug" source "arch/arc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"
source "kernel/power/Kconfig" source "kernel/power/Kconfig"

View File

@ -298,10 +298,6 @@ config PGTABLE_LEVELS
default 3 if ARM_LPAE default 3 if ARM_LPAE
default 2 default 2
source "init/Kconfig"
source "kernel/Kconfig.freezer"
menu "System Type" menu "System Type"
config MMU config MMU
@ -1721,8 +1717,6 @@ config ARM_MODULE_PLTS
Disabling this is usually safe for small single-platform Disabling this is usually safe for small single-platform
configurations. If unsure, say y. configurations. If unsure, say y.
source "mm/Kconfig"
config FORCE_MAX_ZONEORDER config FORCE_MAX_ZONEORDER
int "Maximum zone order" int "Maximum zone order"
default "12" if SOC_AM33XX default "12" if SOC_AM33XX
@ -2175,12 +2169,6 @@ config KERNEL_MODE_NEON
endmenu endmenu
menu "Userspace binary formats"
source "fs/Kconfig.binfmt"
endmenu
menu "Power management options" menu "Power management options"
source "kernel/power/Kconfig" source "kernel/power/Kconfig"
@ -2201,23 +2189,12 @@ config ARCH_HIBERNATION_POSSIBLE
endmenu endmenu
source "net/Kconfig"
source "drivers/Kconfig"
source "drivers/firmware/Kconfig" source "drivers/firmware/Kconfig"
source "fs/Kconfig"
source "arch/arm/Kconfig.debug" source "arch/arm/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
if CRYPTO if CRYPTO
source "arch/arm/crypto/Kconfig" source "arch/arm/crypto/Kconfig"
endif endif
source "lib/Kconfig"
source "arch/arm/kvm/Kconfig" source "arch/arm/kvm/Kconfig"

View File

@ -267,10 +267,6 @@ config ARCH_PROC_KCORE_TEXT
config MULTI_IRQ_HANDLER config MULTI_IRQ_HANDLER
def_bool y def_bool y
source "init/Kconfig"
source "kernel/Kconfig.freezer"
source "arch/arm64/Kconfig.platforms" source "arch/arm64/Kconfig.platforms"
menu "Bus support" menu "Bus support"
@ -791,8 +787,6 @@ config ARCH_WANT_HUGE_PMD_SHARE
config ARCH_HAS_CACHE_LINE_SIZE config ARCH_HAS_CACHE_LINE_SIZE
def_bool y def_bool y
source "mm/Kconfig"
config SECCOMP config SECCOMP
bool "Enable seccomp to safely compute untrusted bytecode" bool "Enable seccomp to safely compute untrusted bytecode"
---help--- ---help---
@ -1273,10 +1267,6 @@ config DMI
endmenu endmenu
menu "Userspace binary formats"
source "fs/Kconfig.binfmt"
config COMPAT config COMPAT
bool "Kernel support for 32-bit EL0" bool "Kernel support for 32-bit EL0"
depends on ARM64_4K_PAGES || EXPERT depends on ARM64_4K_PAGES || EXPERT
@ -1300,8 +1290,6 @@ config SYSVIPC_COMPAT
def_bool y def_bool y
depends on COMPAT && SYSVIPC depends on COMPAT && SYSVIPC
endmenu
menu "Power management options" menu "Power management options"
source "kernel/power/Kconfig" source "kernel/power/Kconfig"
@ -1327,25 +1315,14 @@ source "drivers/cpufreq/Kconfig"
endmenu endmenu
source "net/Kconfig"
source "drivers/Kconfig"
source "drivers/firmware/Kconfig" source "drivers/firmware/Kconfig"
source "drivers/acpi/Kconfig" source "drivers/acpi/Kconfig"
source "fs/Kconfig"
source "arch/arm64/kvm/Kconfig" source "arch/arm64/kvm/Kconfig"
source "arch/arm64/Kconfig.debug" source "arch/arm64/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
if CRYPTO if CRYPTO
source "arch/arm64/crypto/Kconfig" source "arch/arm64/crypto/Kconfig"
endif endif
source "lib/Kconfig"

View File

@ -53,12 +53,8 @@ config C6X_BIG_KERNEL
If unsure, say N. If unsure, say N.
source "init/Kconfig"
# Use the generic interrupt handling code in kernel/irq/ # Use the generic interrupt handling code in kernel/irq/
source "kernel/Kconfig.freezer"
config CMDLINE_BOOL config CMDLINE_BOOL
bool "Default bootloader kernel arguments" bool "Default bootloader kernel arguments"
@ -114,32 +110,12 @@ config KERNEL_RAM_BASE_ADDRESS
default 0xe0000000 if SOC_TMS320C6472 default 0xe0000000 if SOC_TMS320C6472
default 0x80000000 default 0x80000000
source "mm/Kconfig"
source "kernel/Kconfig.preempt" source "kernel/Kconfig.preempt"
source "kernel/Kconfig.hz" source "kernel/Kconfig.hz"
endmenu endmenu
menu "Executable file formats"
source "fs/Kconfig.binfmt"
endmenu
source "net/Kconfig"
source "drivers/Kconfig"
source "fs/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"
menu "Kernel hacking" menu "Kernel hacking"
source "lib/Kconfig.debug" source "lib/Kconfig.debug"

View File

@ -48,40 +48,16 @@ config NR_CPUS
int int
default 1 default 1
source "init/Kconfig"
source "kernel/Kconfig.freezer"
source "arch/h8300/Kconfig.cpu" source "arch/h8300/Kconfig.cpu"
menu "Kernel Features" menu "Kernel Features"
source "kernel/Kconfig.preempt" source "kernel/Kconfig.preempt"
source "mm/Kconfig"
endmenu endmenu
menu "Executable file formats"
source "fs/Kconfig.binfmt"
endmenu
source "net/Kconfig"
source "drivers/Kconfig"
source "fs/Kconfig"
menu "Kernel hacking" menu "Kernel hacking"
source "lib/Kconfig.debug" source "lib/Kconfig.debug"
endmenu endmenu
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"

View File

@ -146,26 +146,10 @@ config PAGE_SIZE_256KB
endchoice endchoice
source "mm/Kconfig"
source "kernel/Kconfig.hz" source "kernel/Kconfig.hz"
endmenu endmenu
source "init/Kconfig"
source "kernel/Kconfig.freezer"
source "drivers/Kconfig"
source "fs/Kconfig"
menu "Executable File Formats"
source "fs/Kconfig.binfmt"
endmenu
source "net/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"
menu "Kernel hacking" menu "Kernel hacking"
source "lib/Kconfig.debug" source "lib/Kconfig.debug"
endmenu endmenu

View File

@ -4,10 +4,6 @@ config PGTABLE_LEVELS
range 3 4 if !IA64_PAGE_SIZE_64KB range 3 4 if !IA64_PAGE_SIZE_64KB
default 3 default 3
source "init/Kconfig"
source "kernel/Kconfig.freezer"
menu "Processor type and features" menu "Processor type and features"
config IA64 config IA64
@ -370,8 +366,6 @@ config FORCE_CPEI_RETARGET
source "kernel/Kconfig.preempt" source "kernel/Kconfig.preempt"
source "mm/Kconfig"
config ARCH_SELECT_MEMORY_MODEL config ARCH_SELECT_MEMORY_MODEL
def_bool y def_bool y
@ -532,8 +526,6 @@ config CRASH_DUMP
source "drivers/firmware/Kconfig" source "drivers/firmware/Kconfig"
source "fs/Kconfig.binfmt"
endmenu endmenu
menu "Power management and ACPI options" menu "Power management and ACPI options"
@ -574,10 +566,6 @@ endmenu
endif endif
source "net/Kconfig"
source "drivers/Kconfig"
source "arch/ia64/hp/sim/Kconfig" source "arch/ia64/hp/sim/Kconfig"
config MSPEC config MSPEC
@ -589,12 +577,4 @@ config MSPEC
operations support (formerly known as fetchop), say Y here, operations support (formerly known as fetchop), say Y here,
otherwise say N. otherwise say N.
source "fs/Kconfig"
source "arch/ia64/Kconfig.debug" source "arch/ia64/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"

View File

@ -75,10 +75,6 @@ config PGTABLE_LEVELS
default 2 if SUN3 || COLDFIRE default 2 if SUN3 || COLDFIRE
default 3 default 3
source "init/Kconfig"
source "kernel/Kconfig.freezer"
config MMU config MMU
bool "MMU-based Paged Memory Management Support" bool "MMU-based Paged Memory Management Support"
default y default y
@ -137,14 +133,6 @@ if COLDFIRE
source "kernel/Kconfig.preempt" source "kernel/Kconfig.preempt"
endif endif
source "mm/Kconfig"
endmenu
menu "Executable file formats"
source "fs/Kconfig.binfmt"
endmenu endmenu
if !MMU if !MMU
@ -158,18 +146,6 @@ config PM
endmenu endmenu
endif endif
source "net/Kconfig"
source "drivers/Kconfig"
source "arch/m68k/Kconfig.devices" source "arch/m68k/Kconfig.devices"
source "fs/Kconfig"
source "arch/m68k/Kconfig.debug" source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"

View File

@ -83,10 +83,6 @@ config STACKTRACE_SUPPORT
config LOCKDEP_SUPPORT config LOCKDEP_SUPPORT
def_bool y def_bool y
source "init/Kconfig"
source "kernel/Kconfig.freezer"
source "arch/microblaze/Kconfig.platform" source "arch/microblaze/Kconfig.platform"
menu "Processor type and features" menu "Processor type and features"
@ -266,14 +262,6 @@ config MICROBLAZE_64K_PAGES
endchoice endchoice
source "mm/Kconfig"
endmenu
menu "Executable file formats"
source "fs/Kconfig.binfmt"
endmenu endmenu
menu "Bus Options" menu "Bus Options"
@ -298,16 +286,4 @@ source "drivers/pci/Kconfig"
endmenu endmenu
source "net/Kconfig"
source "drivers/Kconfig"
source "fs/Kconfig"
source "arch/microblaze/Kconfig.debug" source "arch/microblaze/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"

View File

@ -2641,8 +2641,6 @@ config HW_PERF_EVENTS
Enable hardware performance counter support for perf events. If Enable hardware performance counter support for perf events. If
disabled, perf events will use software events only. disabled, perf events will use software events only.
source "mm/Kconfig"
config SMP config SMP
bool "Multi-Processing support" bool "Multi-Processing support"
depends on SYS_SUPPORTS_SMP depends on SYS_SUPPORTS_SMP
@ -2994,10 +2992,6 @@ config PGTABLE_LEVELS
default 3 if 64BIT && !PAGE_SIZE_64KB default 3 if 64BIT && !PAGE_SIZE_64KB
default 2 default 2
source "init/Kconfig"
source "kernel/Kconfig.freezer"
menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)" menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
config HW_HAS_EISA config HW_HAS_EISA
@ -3127,10 +3121,6 @@ source "drivers/rapidio/Kconfig"
endmenu endmenu
menu "Executable file formats"
source "fs/Kconfig.binfmt"
config TRAD_SIGNALS config TRAD_SIGNALS
bool bool
@ -3176,8 +3166,6 @@ config BINFMT_ELF32
default y if MIPS32_O32 || MIPS32_N32 default y if MIPS32_O32 || MIPS32_N32
select ELFCORE select ELFCORE
endmenu
menu "Power management options" menu "Power management options"
config ARCH_HIBERNATION_POSSIBLE config ARCH_HIBERNATION_POSSIBLE
@ -3205,20 +3193,8 @@ source "drivers/cpuidle/Kconfig"
endmenu endmenu
source "net/Kconfig"
source "drivers/Kconfig"
source "drivers/firmware/Kconfig" source "drivers/firmware/Kconfig"
source "fs/Kconfig"
source "arch/mips/Kconfig.debug" source "arch/mips/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"
source "arch/mips/kvm/Kconfig" source "arch/mips/kvm/Kconfig"

View File

@ -71,8 +71,6 @@ config FIX_EARLYCON_MEM
config PGTABLE_LEVELS config PGTABLE_LEVELS
default 2 default 2
source "init/Kconfig"
menu "System Type" menu "System Type"
source "arch/nds32/Kconfig.cpu" source "arch/nds32/Kconfig.cpu"
config NR_CPUS config NR_CPUS
@ -91,23 +89,9 @@ endmenu
menu "Kernel Features" menu "Kernel Features"
source "kernel/Kconfig.preempt" source "kernel/Kconfig.preempt"
source "kernel/Kconfig.freezer"
source "mm/Kconfig"
source "kernel/Kconfig.hz" source "kernel/Kconfig.hz"
endmenu endmenu
menu "Executable file formats"
source "fs/Kconfig.binfmt"
endmenu
source "net/Kconfig"
source "drivers/Kconfig"
source "fs/Kconfig"
menu "Kernel hacking" menu "Kernel hacking"
source "lib/Kconfig.debug" source "lib/Kconfig.debug"
endmenu endmenu
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"

View File

@ -45,18 +45,12 @@ config RWSEM_GENERIC_SPINLOCK
config TRACE_IRQFLAGS_SUPPORT config TRACE_IRQFLAGS_SUPPORT
def_bool n def_bool n
source "init/Kconfig"
menu "Kernel features" menu "Kernel features"
source "kernel/Kconfig.preempt" source "kernel/Kconfig.preempt"
source "kernel/Kconfig.freezer"
source "kernel/Kconfig.hz" source "kernel/Kconfig.hz"
source "mm/Kconfig"
config FORCE_MAX_ZONEORDER config FORCE_MAX_ZONEORDER
int "Maximum zone order" int "Maximum zone order"
range 9 20 range 9 20
@ -194,22 +188,4 @@ config NIOS2_IO_REGION_BASE
endmenu endmenu
menu "Executable file formats"
source "fs/Kconfig.binfmt"
endmenu
source "net/Kconfig"
source "drivers/Kconfig"
source "fs/Kconfig"
source "arch/nios2/Kconfig.debug" source "arch/nios2/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"

View File

@ -72,10 +72,6 @@ config LOCKDEP_SUPPORT
config MULTI_IRQ_HANDLER config MULTI_IRQ_HANDLER
def_bool y def_bool y
source "init/Kconfig"
source "kernel/Kconfig.freezer"
menu "Processor type and features" menu "Processor type and features"
choice choice
@ -148,7 +144,6 @@ config SMP
source kernel/Kconfig.hz source kernel/Kconfig.hz
source kernel/Kconfig.preempt source kernel/Kconfig.preempt
source "mm/Kconfig"
config OPENRISC_NO_SPR_SR_DSX config OPENRISC_NO_SPR_SR_DSX
bool "use SPR_SR_DSX software emulation" if OR1K_1200 bool "use SPR_SR_DSX software emulation" if OR1K_1200
@ -207,24 +202,6 @@ endmenu
endmenu endmenu
menu "Executable file formats"
source "fs/Kconfig.binfmt"
endmenu
source "net/Kconfig"
source "drivers/Kconfig"
source "fs/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"
menu "Kernel hacking" menu "Kernel hacking"
source "lib/Kconfig.debug" source "lib/Kconfig.debug"

View File

@ -129,10 +129,6 @@ config PGTABLE_LEVELS
config SYS_SUPPORTS_HUGETLBFS config SYS_SUPPORTS_HUGETLBFS
def_bool y if PA20 def_bool y if PA20
source "init/Kconfig"
source "kernel/Kconfig.freezer"
menu "Processor type and features" menu "Processor type and features"
@ -329,7 +325,6 @@ config NODES_SHIFT
source "kernel/Kconfig.preempt" source "kernel/Kconfig.preempt"
source "kernel/Kconfig.hz" source "kernel/Kconfig.hz"
source "mm/Kconfig"
config COMPAT config COMPAT
def_bool y def_bool y
@ -354,19 +349,6 @@ endmenu
source "drivers/parisc/Kconfig" source "drivers/parisc/Kconfig"
menu "Executable file formats"
source "fs/Kconfig.binfmt"
endmenu
source "net/Kconfig"
source "drivers/Kconfig"
source "fs/Kconfig"
source "arch/parisc/Kconfig.debug" source "arch/parisc/Kconfig.debug"
config SECCOMP config SECCOMP
@ -384,9 +366,3 @@ config SECCOMP
defined by each seccomp mode. defined by each seccomp mode.
If unsure, say Y. Only embedded should say N here. If unsure, say Y. Only embedded should say N here.
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"

View File

@ -383,10 +383,6 @@ config PGTABLE_LEVELS
default 3 if PPC_64K_PAGES && !PPC_BOOK3S_64 default 3 if PPC_64K_PAGES && !PPC_BOOK3S_64
default 4 default 4
source "init/Kconfig"
source "kernel/Kconfig.freezer"
source "arch/powerpc/sysdev/Kconfig" source "arch/powerpc/sysdev/Kconfig"
source "arch/powerpc/platforms/Kconfig" source "arch/powerpc/platforms/Kconfig"
@ -398,7 +394,6 @@ config HIGHMEM
source kernel/Kconfig.hz source kernel/Kconfig.hz
source kernel/Kconfig.preempt source kernel/Kconfig.preempt
source "fs/Kconfig.binfmt"
config HUGETLB_PAGE_SIZE_VARIABLE config HUGETLB_PAGE_SIZE_VARIABLE
bool bool
@ -641,8 +636,6 @@ config ILLEGAL_POINTER_VALUE
default 0x5deadbeef0000000 if PPC64 default 0x5deadbeef0000000 if PPC64
default 0 default 0
source "mm/Kconfig"
config ARCH_MEMORY_PROBE config ARCH_MEMORY_PROBE
def_bool y def_bool y
depends on MEMORY_HOTPLUG depends on MEMORY_HOTPLUG
@ -1201,20 +1194,8 @@ endif
config ARCH_RANDOM config ARCH_RANDOM
def_bool n def_bool n
source "net/Kconfig"
source "drivers/Kconfig"
source "fs/Kconfig"
source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug" source "arch/powerpc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
config PPC_LIB_RHEAP config PPC_LIB_RHEAP
bool bool

View File

@ -212,8 +212,6 @@ endmenu
menu "Kernel type" menu "Kernel type"
source "mm/Kconfig"
source "kernel/Kconfig.preempt" source "kernel/Kconfig.preempt"
source "kernel/Kconfig.hz" source "kernel/Kconfig.hz"
@ -242,28 +240,12 @@ source "drivers/pci/Kconfig"
endmenu endmenu
source "init/Kconfig"
source "kernel/Kconfig.freezer"
menu "Executable file formats"
source "fs/Kconfig.binfmt"
endmenu
menu "Power management options" menu "Power management options"
source kernel/power/Kconfig source kernel/power/Kconfig
endmenu endmenu
source "net/Kconfig"
source "drivers/Kconfig"
source "fs/Kconfig"
menu "Kernel hacking" menu "Kernel hacking"
config CMDLINE_BOOL config CMDLINE_BOOL
@ -308,9 +290,3 @@ source "lib/Kconfig.debug"
config CMDLINE_BOOL config CMDLINE_BOOL
bool bool
endmenu endmenu
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"

View File

@ -184,10 +184,6 @@ config PGTABLE_LEVELS
int int
default 5 default 5
source "init/Kconfig"
source "kernel/Kconfig.freezer"
source "kernel/livepatch/Kconfig" source "kernel/livepatch/Kconfig"
menu "Processor type and features" menu "Processor type and features"
@ -627,8 +623,6 @@ config FORCE_MAX_ZONEORDER
int int
default "9" default "9"
source "mm/Kconfig"
config MAX_PHYSMEM_BITS config MAX_PHYSMEM_BITS
int "Maximum size of supported physical memory in bits (42-53)" int "Maximum size of supported physical memory in bits (42-53)"
range 42 53 range 42 53
@ -798,10 +792,6 @@ config CRASH_DUMP
endmenu endmenu
menu "Executable file formats / Emulations"
source "fs/Kconfig.binfmt"
config SECCOMP config SECCOMP
def_bool y def_bool y
prompt "Enable seccomp to safely compute untrusted bytecode" prompt "Enable seccomp to safely compute untrusted bytecode"
@ -819,8 +809,6 @@ config SECCOMP
If unsure, say Y. If unsure, say Y.
endmenu
menu "Power Management" menu "Power Management"
config ARCH_HIBERNATION_POSSIBLE config ARCH_HIBERNATION_POSSIBLE
@ -830,30 +818,18 @@ source "kernel/power/Kconfig"
endmenu endmenu
source "net/Kconfig"
config PCMCIA config PCMCIA
def_bool n def_bool n
config CCW config CCW
def_bool y def_bool y
source "drivers/Kconfig"
config HAVE_PNETID config HAVE_PNETID
tristate tristate
default (SMC || CCWGROUP) default (SMC || CCWGROUP)
source "fs/Kconfig"
source "arch/s390/Kconfig.debug" source "arch/s390/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"
menu "Virtualization" menu "Virtualization"
config PFAULT config PFAULT

View File

@ -168,10 +168,6 @@ config PGTABLE_LEVELS
default 3 if X2TLB default 3 if X2TLB
default 2 default 2
source "init/Kconfig"
source "kernel/Kconfig.freezer"
menu "System type" menu "System type"
# #
@ -882,12 +878,6 @@ source "drivers/pcmcia/Kconfig"
endmenu endmenu
menu "Executable file formats"
source "fs/Kconfig.binfmt"
endmenu
menu "Power management options (EXPERIMENTAL)" menu "Power management options (EXPERIMENTAL)"
source "kernel/power/Kconfig" source "kernel/power/Kconfig"
@ -896,16 +886,4 @@ source "drivers/cpuidle/Kconfig"
endmenu endmenu
source "net/Kconfig"
source "drivers/Kconfig"
source "fs/Kconfig"
source "arch/sh/Kconfig.debug" source "arch/sh/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"

View File

@ -225,8 +225,6 @@ config HUGETLB_PAGE_SIZE_512MB
endchoice endchoice
source "mm/Kconfig"
config SCHED_MC config SCHED_MC
bool "Multi-core scheduler support" bool "Multi-core scheduler support"
depends on SMP depends on SMP

View File

@ -155,10 +155,6 @@ config PGTABLE_LEVELS
config ARCH_SUPPORTS_UPROBES config ARCH_SUPPORTS_UPROBES
def_bool y if SPARC64 def_bool y if SPARC64
source "init/Kconfig"
source "kernel/Kconfig.freezer"
menu "Processor type and features" menu "Processor type and features"
config SMP config SMP
@ -331,8 +327,6 @@ config FORCE_MAX_ZONEORDER
This config option is actually maximum order plus one. For example, This config option is actually maximum order plus one. For example,
a value of 13 means that the largest free memory block is 2^12 pages. a value of 13 means that the largest free memory block is 2^12 pages.
source "mm/Kconfig"
if SPARC64 if SPARC64
source "kernel/power/Kconfig" source "kernel/power/Kconfig"
endif endif
@ -556,10 +550,6 @@ config SPARC64_PCI_MSI
endmenu endmenu
menu "Executable file formats"
source "fs/Kconfig.binfmt"
config COMPAT config COMPAT
bool bool
depends on SPARC64 depends on SPARC64
@ -574,20 +564,6 @@ config SYSVIPC_COMPAT
depends on COMPAT && SYSVIPC depends on COMPAT && SYSVIPC
default y default y
endmenu
source "net/Kconfig"
source "drivers/Kconfig"
source "drivers/sbus/char/Kconfig" source "drivers/sbus/char/Kconfig"
source "fs/Kconfig"
source "arch/sparc/Kconfig.debug" source "arch/sparc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"

View File

@ -75,8 +75,6 @@ config STATIC_LINK
Additionally, this option enables using higher memory spaces (up to Additionally, this option enables using higher memory spaces (up to
2.75G) for UML. 2.75G) for UML.
source "mm/Kconfig"
config LD_SCRIPT_STATIC config LD_SCRIPT_STATIC
bool bool
default y default y
@ -88,8 +86,6 @@ config LD_SCRIPT_DYN
depends on !LD_SCRIPT_STATIC depends on !LD_SCRIPT_STATIC
select MODULE_REL_CRCS if MODVERSIONS select MODULE_REL_CRCS if MODVERSIONS
source "fs/Kconfig.binfmt"
config HOSTFS config HOSTFS
tristate "Host filesystem" tristate "Host filesystem"
help help
@ -190,22 +186,6 @@ config SECCOMP
endmenu endmenu
source "init/Kconfig"
source "kernel/Kconfig.freezer"
source "arch/um/drivers/Kconfig" source "arch/um/drivers/Kconfig"
source "drivers/Kconfig"
source "net/Kconfig"
source "fs/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"
source "arch/um/Kconfig.debug" source "arch/um/Kconfig.debug"

View File

@ -63,10 +63,6 @@ config ARCH_MAY_HAVE_PC_FDC
config ZONE_DMA config ZONE_DMA
def_bool y def_bool y
source "init/Kconfig"
source "kernel/Kconfig.freezer"
menu "System Type" menu "System Type"
config MMU config MMU
@ -143,8 +139,6 @@ source "kernel/Kconfig.preempt"
source "kernel/Kconfig.hz" source "kernel/Kconfig.hz"
source "mm/Kconfig"
config LEDS config LEDS
def_bool y def_bool y
depends on GPIOLIB depends on GPIOLIB
@ -181,12 +175,6 @@ config CMDLINE_FORCE
endmenu endmenu
menu "Userspace binary formats"
source "fs/Kconfig.binfmt"
endmenu
menu "Power management options" menu "Power management options"
source "kernel/power/Kconfig" source "kernel/power/Kconfig"
@ -201,8 +189,6 @@ config ARCH_HIBERNATION_POSSIBLE
endmenu endmenu
source "net/Kconfig"
if ARCH_PUV3 if ARCH_PUV3
config PUV3_GPIO config PUV3_GPIO
@ -237,14 +223,4 @@ endif
endif endif
source "drivers/Kconfig"
source "fs/Kconfig"
source "arch/unicore32/Kconfig.debug" source "arch/unicore32/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"

View File

@ -345,8 +345,6 @@ config PGTABLE_LEVELS
default 3 if X86_PAE default 3 if X86_PAE
default 2 default 2
source "init/Kconfig"
config CC_HAS_SANE_STACKPROTECTOR config CC_HAS_SANE_STACKPROTECTOR
bool bool
default $(success,$(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC)) if 64BIT default $(success,$(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC)) if 64BIT
@ -355,8 +353,6 @@ config CC_HAS_SANE_STACKPROTECTOR
We have to make sure stack protector is unconditionally disabled if We have to make sure stack protector is unconditionally disabled if
the compiler produces broken code. the compiler produces broken code.
source "kernel/Kconfig.freezer"
menu "Processor type and features" menu "Processor type and features"
config ZONE_DMA config ZONE_DMA
@ -1638,8 +1634,6 @@ config ILLEGAL_POINTER_VALUE
default 0 if X86_32 default 0 if X86_32
default 0xdead000000000000 if X86_64 default 0xdead000000000000 if X86_64
source "mm/Kconfig"
config X86_PMEM_LEGACY_DEVICE config X86_PMEM_LEGACY_DEVICE
bool bool
@ -2865,9 +2859,7 @@ config X86_SYSFB
endmenu endmenu
menu "Executable file formats / Emulations" menu "Binary Emulations"
source "fs/Kconfig.binfmt"
config IA32_EMULATION config IA32_EMULATION
bool "IA32 Emulation" bool "IA32 Emulation"
@ -2937,20 +2929,8 @@ config X86_DMA_REMAP
config HAVE_GENERIC_GUP config HAVE_GENERIC_GUP
def_bool y def_bool y
source "net/Kconfig"
source "drivers/Kconfig"
source "drivers/firmware/Kconfig" source "drivers/firmware/Kconfig"
source "fs/Kconfig"
source "arch/x86/Kconfig.debug" source "arch/x86/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
source "arch/x86/kvm/Kconfig" source "arch/x86/kvm/Kconfig"
source "lib/Kconfig"

View File

@ -60,9 +60,6 @@ config HZ
int int
default 100 default 100
source "init/Kconfig"
source "kernel/Kconfig.freezer"
config LOCKDEP_SUPPORT config LOCKDEP_SUPPORT
def_bool y def_bool y
@ -491,8 +488,6 @@ config SIMDISK1_FILENAME
Another simulated disk in a host file for a buildroot-independent Another simulated disk in a host file for a buildroot-independent
storage. storage.
source "mm/Kconfig"
config FORCE_MAX_ZONEORDER config FORCE_MAX_ZONEORDER
int "Maximum zone order" int "Maximum zone order"
default "11" default "11"
@ -567,30 +562,10 @@ config XTFPGA_LCD_8BIT_ACCESS
endmenu endmenu
menu "Executable file formats"
source "fs/Kconfig.binfmt"
endmenu
menu "Power management options" menu "Power management options"
source "kernel/power/Kconfig" source "kernel/power/Kconfig"
endmenu endmenu
source "net/Kconfig"
source "drivers/Kconfig"
source "fs/Kconfig"
source "arch/xtensa/Kconfig.debug" source "arch/xtensa/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
source "lib/Kconfig"

View File

@ -1721,10 +1721,10 @@ config PROFILING
config TRACEPOINTS config TRACEPOINTS
bool bool
source "arch/Kconfig"
endmenu # General setup endmenu # General setup
source "arch/Kconfig"
config RT_MUTEXES config RT_MUTEXES
bool bool