Commit fa1b5d09 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kconfig-v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild 

Pull Kconfig consolidation from Masahiro Yamada:
 "Consolidation of Kconfig files by Christoph Hellwig.

  Move the source statements of arch-independent Kconfig files instead
  of duplicating the includes in every arch/$(SRCARCH)/Kconfig"

* tag 'kconfig-v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kconfig: add a Memory Management options" menu
  kconfig: move the "Executable file formats" menu to fs/Kconfig.binfmt
  kconfig: use a menu in arch/Kconfig to reduce clutter
  kconfig: include kernel/Kconfig.preempt from init/Kconfig
  Kconfig: consolidate the "Kernel hacking" menu
  kconfig: include common Kconfig files from top-level Kconfig
  kconfig: remove duplicate SWAP symbol defintions
  um: create a proper drivers Kconfig
  um: cleanup Kconfig files
  um: stop abusing KBUILD_KCONFIG
parents 01f0e5cd 59e0b520

Kconfig

+21 −1
Original line number Diff line number Diff line
@@ -9,4 +9,24 @@ comment "Compiler: $(CC_VERSION_TEXT)" 


source "scripts/Kconfig.include"



source "arch/$(SRCARCH)/Kconfig"
 
source "init/Kconfig"



source "kernel/Kconfig.freezer"



source "fs/Kconfig.binfmt"



source "mm/Kconfig"



source "net/Kconfig"



source "drivers/Kconfig"



source "fs/Kconfig"



source "security/Kconfig"



source "crypto/Kconfig"



source "lib/Kconfig"



source "lib/Kconfig.debug"

arch/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -3,6 +3,14 @@ 
# 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"



menu "General architecture-dependent options"



config CRASH_CORE

	bool
@@ -734,6 +742,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
@@ -833,3 +844,5 @@ config REFCOUNT_FULL 
source "kernel/gcov/Kconfig"



source "scripts/gcc-plugins/Kconfig"



endmenu

arch/alpha/Kconfig

+1 −22
Original line number Diff line number Diff line
@@ -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
@@ -74,9 +75,6 @@ config PGTABLE_LEVELS 
	int

	default 3



source "init/Kconfig"

source "kernel/Kconfig.freezer"



config AUDIT_ARCH

	bool
@@ -573,8 +571,6 @@ config ARCH_DISCONTIGMEM_ENABLE 
	  or have huge holes in the physical address space for other reasons.

	  See <file:Documentation/vm/numa.rst> for more.



source "mm/Kconfig"



config NUMA

	bool "NUMA Support (EXPERIMENTAL)"

	depends on DISCONTIGMEM && BROKEN
@@ -713,28 +709,11 @@ config SRM_ENV 
	  This driver is also available as a module and will be called

	  srm_env then.



source "fs/Kconfig.binfmt"



endmenu



source "net/Kconfig"



source "drivers/Kconfig"



source "fs/Kconfig"



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

	bool

	depends on VGA_HOSE

	default y
 


source "security/Kconfig"



source "crypto/Kconfig"



source "lib/Kconfig"

arch/alpha/Kconfig.debug

+0 −5
Original line number Diff line number Diff line 
# 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

arch/arc/Kconfig

+0 −19
Original line number Diff line number Diff line
@@ -97,9 +97,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"
@@ -551,24 +548,13 @@ 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"



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
@@ -589,9 +575,4 @@ 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"

CRA Git | Maintained and supported by SUSTech CRA and CCSE