aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Kconfig22
-rw-r--r--arch/Kconfig13
-rw-r--r--arch/alpha/Kconfig23
-rw-r--r--arch/alpha/Kconfig.debug5
-rw-r--r--arch/arc/Kconfig19
-rw-r--r--arch/arc/Kconfig.debug5
-rw-r--r--arch/arm/Kconfig27
-rw-r--r--arch/arm/Kconfig.debug5
-rw-r--r--arch/arm64/Kconfig26
-rw-r--r--arch/arm64/Kconfig.debug5
-rw-r--r--arch/c6x/Kconfig41
-rw-r--r--arch/c6x/Kconfig.debug10
-rw-r--r--arch/h8300/Kconfig36
-rw-r--r--arch/h8300/Kconfig.debug1
-rw-r--r--arch/hexagon/Kconfig21
-rw-r--r--arch/hexagon/Kconfig.debug1
-rw-r--r--arch/ia64/Kconfig24
-rw-r--r--arch/ia64/Kconfig.debug5
-rw-r--r--arch/m68k/Kconfig31
-rw-r--r--arch/m68k/Kconfig.debug5
-rw-r--r--arch/microblaze/Kconfig32
-rw-r--r--arch/microblaze/Kconfig.debug6
-rw-r--r--arch/mips/Kconfig28
-rw-r--r--arch/mips/Kconfig.debug5
-rw-r--r--arch/nds32/Kconfig21
-rw-r--r--arch/nds32/Kconfig.debug1
-rw-r--r--arch/nios2/Kconfig32
-rw-r--r--arch/nios2/Kconfig.debug5
-rw-r--r--arch/openrisc/Kconfig30
-rw-r--r--arch/openrisc/Kconfig.debug1
-rw-r--r--arch/parisc/Kconfig27
-rw-r--r--arch/parisc/Kconfig.debug5
-rw-r--r--arch/powerpc/Kconfig22
-rw-r--r--arch/powerpc/Kconfig.debug5
-rw-r--r--arch/riscv/Kconfig71
-rw-r--r--arch/riscv/Kconfig.debug37
-rw-r--r--arch/s390/Kconfig28
-rw-r--r--arch/s390/Kconfig.debug5
-rw-r--r--arch/sh/Kconfig26
-rw-r--r--arch/sh/Kconfig.debug5
-rw-r--r--arch/sh/mm/Kconfig2
-rw-r--r--arch/sparc/Kconfig28
-rw-r--r--arch/sparc/Kconfig.debug5
-rw-r--r--arch/um/Kconfig (renamed from arch/um/Kconfig.um)74
-rw-r--r--arch/um/Kconfig.char124
-rw-r--r--arch/um/Kconfig.common60
-rw-r--r--arch/um/Kconfig.debug5
-rw-r--r--arch/um/Kconfig.rest22
-rw-r--r--arch/um/Makefile4
-rw-r--r--arch/um/drivers/Kconfig (renamed from arch/um/Kconfig.net)125
-rw-r--r--arch/unicore32/Kconfig28
-rw-r--r--arch/unicore32/Kconfig.debug5
-rw-r--r--arch/x86/Kconfig26
-rw-r--r--arch/x86/Kconfig.debug5
-rw-r--r--arch/x86/um/Kconfig15
-rw-r--r--arch/xtensa/Kconfig29
-rw-r--r--arch/xtensa/Kconfig.debug5
-rw-r--r--fs/Kconfig.binfmt5
-rw-r--r--init/Kconfig14
-rw-r--r--kernel/Kconfig.preempt2
-rw-r--r--lib/Kconfig.debug7
-rw-r--r--mm/Kconfig5
62 files changed, 316 insertions, 996 deletions
diff --git a/Kconfig b/Kconfig
index a90d9f9e268b..48a80beab685 100644
--- a/Kconfig
+++ b/Kconfig
@@ -9,4 +9,24 @@ comment "Compiler: $(CC_VERSION_TEXT)"
9 9
10source "scripts/Kconfig.include" 10source "scripts/Kconfig.include"
11 11
12source "arch/$(SRCARCH)/Kconfig" 12source "init/Kconfig"
13
14source "kernel/Kconfig.freezer"
15
16source "fs/Kconfig.binfmt"
17
18source "mm/Kconfig"
19
20source "net/Kconfig"
21
22source "drivers/Kconfig"
23
24source "fs/Kconfig"
25
26source "security/Kconfig"
27
28source "crypto/Kconfig"
29
30source "lib/Kconfig"
31
32source "lib/Kconfig.debug"
diff --git a/arch/Kconfig b/arch/Kconfig
index 8543bc3c21fe..c6148166a7b4 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -3,6 +3,14 @@
3# General architecture dependent options 3# General architecture dependent options
4# 4#
5 5
6#
7# Note: arch/$(SRCARCH)/Kconfig needs to be included first so that it can
8# override the default values in this file.
9#
10source "arch/$(SRCARCH)/Kconfig"
11
12menu "General architecture-dependent options"
13
6config CRASH_CORE 14config CRASH_CORE
7 bool 15 bool
8 16
@@ -734,6 +742,9 @@ config COMPAT_32BIT_TIME
734config ARCH_NO_COHERENT_DMA_MMAP 742config ARCH_NO_COHERENT_DMA_MMAP
735 bool 743 bool
736 744
745config ARCH_NO_PREEMPT
746 bool
747
737config CPU_NO_EFFICIENT_FFS 748config CPU_NO_EFFICIENT_FFS
738 def_bool n 749 def_bool n
739 750
@@ -833,3 +844,5 @@ config REFCOUNT_FULL
833source "kernel/gcov/Kconfig" 844source "kernel/gcov/Kconfig"
834 845
835source "scripts/gcc-plugins/Kconfig" 846source "scripts/gcc-plugins/Kconfig"
847
848endmenu
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 04a4a138ed13..5b4f88363453 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -4,6 +4,7 @@ config ALPHA
4 default y 4 default y
5 select ARCH_MIGHT_HAVE_PC_PARPORT 5 select ARCH_MIGHT_HAVE_PC_PARPORT
6 select ARCH_MIGHT_HAVE_PC_SERIO 6 select ARCH_MIGHT_HAVE_PC_SERIO
7 select ARCH_NO_PREEMPT
7 select ARCH_USE_CMPXCHG_LOCKREF 8 select ARCH_USE_CMPXCHG_LOCKREF
8 select HAVE_AOUT 9 select HAVE_AOUT
9 select HAVE_IDE 10 select HAVE_IDE
@@ -74,9 +75,6 @@ config PGTABLE_LEVELS
74 int 75 int
75 default 3 76 default 3
76 77
77source "init/Kconfig"
78source "kernel/Kconfig.freezer"
79
80config AUDIT_ARCH 78config AUDIT_ARCH
81 bool 79 bool
82 80
@@ -573,8 +571,6 @@ config ARCH_DISCONTIGMEM_ENABLE
573 or have huge holes in the physical address space for other reasons. 571 or have huge holes in the physical address space for other reasons.
574 See <file:Documentation/vm/numa.rst> for more. 572 See <file:Documentation/vm/numa.rst> for more.
575 573
576source "mm/Kconfig"
577
578config NUMA 574config NUMA
579 bool "NUMA Support (EXPERIMENTAL)" 575 bool "NUMA Support (EXPERIMENTAL)"
580 depends on DISCONTIGMEM && BROKEN 576 depends on DISCONTIGMEM && BROKEN
@@ -713,28 +709,11 @@ config SRM_ENV
713 This driver is also available as a module and will be called 709 This driver is also available as a module and will be called
714 srm_env then. 710 srm_env then.
715 711
716source "fs/Kconfig.binfmt"
717
718endmenu 712endmenu
719 713
720source "net/Kconfig"
721
722source "drivers/Kconfig"
723
724source "fs/Kconfig"
725
726source "arch/alpha/Kconfig.debug"
727
728# DUMMY_CONSOLE may be defined in drivers/video/console/Kconfig 714# DUMMY_CONSOLE may be defined in drivers/video/console/Kconfig
729# but we also need it if VGA_HOSE is set 715# but we also need it if VGA_HOSE is set
730config DUMMY_CONSOLE 716config DUMMY_CONSOLE
731 bool 717 bool
732 depends on VGA_HOSE 718 depends on VGA_HOSE
733 default y 719 default y
734
735source "security/Kconfig"
736
737source "crypto/Kconfig"
738
739source "lib/Kconfig"
740
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 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2menu "Kernel hacking"
3
4source "lib/Kconfig.debug"
5 2
6config EARLY_PRINTK 3config EARLY_PRINTK
7 bool 4 bool
@@ -39,5 +36,3 @@ config MATHEMU
39 This option is required for IEEE compliant floating point arithmetic 36 This option is required for IEEE compliant floating point arithmetic
40 on the Alpha. The only time you would ever not say Y is to say M in 37 on the Alpha. The only time you would ever not say Y is to say M in
41 order to debug the code. Say Y unless you know what you are doing. 38 order to debug the code. Say Y unless you know what you are doing.
42
43endmenu
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 5151d81476a1..6d5eb8267e42 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -97,9 +97,6 @@ config HAVE_ARCH_TRANSPARENT_HUGEPAGE
97 def_bool y 97 def_bool y
98 depends on ARC_MMU_V4 98 depends on ARC_MMU_V4
99 99
100source "init/Kconfig"
101source "kernel/Kconfig.freezer"
102
103menu "ARC Architecture Configuration" 100menu "ARC Architecture Configuration"
104 101
105menu "ARC Platform/SoC/Board" 102menu "ARC Platform/SoC/Board"
@@ -551,24 +548,13 @@ config ARC_BUILTIN_DTB_NAME
551 Set the name of the DTB to embed in the vmlinux binary 548 Set the name of the DTB to embed in the vmlinux binary
552 Leaving it blank selects the minimal "skeleton" dtb 549 Leaving it blank selects the minimal "skeleton" dtb
553 550
554source "kernel/Kconfig.preempt"
555
556menu "Executable file formats"
557source "fs/Kconfig.binfmt"
558endmenu
559
560endmenu # "ARC Architecture Configuration" 551endmenu # "ARC Architecture Configuration"
561 552
562source "mm/Kconfig"
563
564config FORCE_MAX_ZONEORDER 553config FORCE_MAX_ZONEORDER
565 int "Maximum zone order" 554 int "Maximum zone order"
566 default "12" if ARC_HUGEPAGE_16M 555 default "12" if ARC_HUGEPAGE_16M
567 default "11" 556 default "11"
568 557
569source "net/Kconfig"
570source "drivers/Kconfig"
571
572menu "Bus Support" 558menu "Bus Support"
573 559
574config PCI 560config PCI
@@ -589,9 +575,4 @@ source "drivers/pci/Kconfig"
589 575
590endmenu 576endmenu
591 577
592source "fs/Kconfig"
593source "arch/arc/Kconfig.debug"
594source "security/Kconfig"
595source "crypto/Kconfig"
596source "lib/Kconfig"
597source "kernel/power/Kconfig" 578source "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 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2menu "Kernel hacking"
3
4source "lib/Kconfig.debug"
5 2
6config 16KSTACKS 3config 16KSTACKS
7 bool "Use 16Kb for kernel stacks instead of 8Kb" 4 bool "Use 16Kb for kernel stacks instead of 8Kb"
@@ -11,5 +8,3 @@ config 16KSTACKS
11 This increases the resident kernel footprint and will cause less 8 This increases the resident kernel footprint and will cause less
12 threads to run on the system and also increase the pressure 9 threads to run on the system and also increase the pressure
13 on the VM subsystem for higher order allocations. 10 on the VM subsystem for higher order allocations.
14
15endmenu
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0f328d639d51..f69613fd4e68 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -299,10 +299,6 @@ config PGTABLE_LEVELS
299 default 3 if ARM_LPAE 299 default 3 if ARM_LPAE
300 default 2 300 default 2
301 301
302source "init/Kconfig"
303
304source "kernel/Kconfig.freezer"
305
306menu "System Type" 302menu "System Type"
307 303
308config MMU 304config MMU
@@ -1481,8 +1477,6 @@ config ARCH_NR_GPIO
1481 1477
1482 If unsure, leave the default value. 1478 If unsure, leave the default value.
1483 1479
1484source kernel/Kconfig.preempt
1485
1486config HZ_FIXED 1480config HZ_FIXED
1487 int 1481 int
1488 default 200 if ARCH_EBSA110 1482 default 200 if ARCH_EBSA110
@@ -1717,8 +1711,6 @@ config ARM_MODULE_PLTS
1717 Disabling this is usually safe for small single-platform 1711 Disabling this is usually safe for small single-platform
1718 configurations. If unsure, say y. 1712 configurations. If unsure, say y.
1719 1713
1720source "mm/Kconfig"
1721
1722config FORCE_MAX_ZONEORDER 1714config FORCE_MAX_ZONEORDER
1723 int "Maximum zone order" 1715 int "Maximum zone order"
1724 default "12" if SOC_AM33XX 1716 default "12" if SOC_AM33XX
@@ -2171,12 +2163,6 @@ config KERNEL_MODE_NEON
2171 2163
2172endmenu 2164endmenu
2173 2165
2174menu "Userspace binary formats"
2175
2176source "fs/Kconfig.binfmt"
2177
2178endmenu
2179
2180menu "Power management options" 2166menu "Power management options"
2181 2167
2182source "kernel/power/Kconfig" 2168source "kernel/power/Kconfig"
@@ -2197,23 +2183,10 @@ config ARCH_HIBERNATION_POSSIBLE
2197 2183
2198endmenu 2184endmenu
2199 2185
2200source "net/Kconfig"
2201
2202source "drivers/Kconfig"
2203
2204source "drivers/firmware/Kconfig" 2186source "drivers/firmware/Kconfig"
2205 2187
2206source "fs/Kconfig"
2207
2208source "arch/arm/Kconfig.debug"
2209
2210source "security/Kconfig"
2211
2212source "crypto/Kconfig"
2213if CRYPTO 2188if CRYPTO
2214source "arch/arm/crypto/Kconfig" 2189source "arch/arm/crypto/Kconfig"
2215endif 2190endif
2216 2191
2217source "lib/Kconfig"
2218
2219source "arch/arm/kvm/Kconfig" 2192source "arch/arm/kvm/Kconfig"
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 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2menu "Kernel hacking"
3
4source "lib/Kconfig.debug"
5 2
6config ARM_PTDUMP_CORE 3config ARM_PTDUMP_CORE
7 def_bool n 4 def_bool n
@@ -1863,5 +1860,3 @@ config PID_IN_CONTEXTIDR
1863 are planning to use hardware trace tools with this kernel. 1860 are planning to use hardware trace tools with this kernel.
1864 1861
1865source "drivers/hwtracing/coresight/Kconfig" 1862source "drivers/hwtracing/coresight/Kconfig"
1866
1867endmenu
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 260ff5da92ac..d0a53cc6293a 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -279,10 +279,6 @@ config ARCH_SUPPORTS_UPROBES
279config ARCH_PROC_KCORE_TEXT 279config ARCH_PROC_KCORE_TEXT
280 def_bool y 280 def_bool y
281 281
282source "init/Kconfig"
283
284source "kernel/Kconfig.freezer"
285
286source "arch/arm64/Kconfig.platforms" 282source "arch/arm64/Kconfig.platforms"
287 283
288menu "Bus support" 284menu "Bus support"
@@ -768,7 +764,6 @@ config HOLES_IN_ZONE
768 def_bool y 764 def_bool y
769 depends on NUMA 765 depends on NUMA
770 766
771source kernel/Kconfig.preempt
772source kernel/Kconfig.hz 767source kernel/Kconfig.hz
773 768
774config ARCH_SUPPORTS_DEBUG_PAGEALLOC 769config ARCH_SUPPORTS_DEBUG_PAGEALLOC
@@ -806,8 +801,6 @@ config ARCH_WANT_HUGE_PMD_SHARE
806config ARCH_HAS_CACHE_LINE_SIZE 801config ARCH_HAS_CACHE_LINE_SIZE
807 def_bool y 802 def_bool y
808 803
809source "mm/Kconfig"
810
811config SECCOMP 804config SECCOMP
812 bool "Enable seccomp to safely compute untrusted bytecode" 805 bool "Enable seccomp to safely compute untrusted bytecode"
813 ---help--- 806 ---help---
@@ -1289,10 +1282,6 @@ config DMI
1289 1282
1290endmenu 1283endmenu
1291 1284
1292menu "Userspace binary formats"
1293
1294source "fs/Kconfig.binfmt"
1295
1296config COMPAT 1285config COMPAT
1297 bool "Kernel support for 32-bit EL0" 1286 bool "Kernel support for 32-bit EL0"
1298 depends on ARM64_4K_PAGES || EXPERT 1287 depends on ARM64_4K_PAGES || EXPERT
@@ -1316,8 +1305,6 @@ config SYSVIPC_COMPAT
1316 def_bool y 1305 def_bool y
1317 depends on COMPAT && SYSVIPC 1306 depends on COMPAT && SYSVIPC
1318 1307
1319endmenu
1320
1321menu "Power management options" 1308menu "Power management options"
1322 1309
1323source "kernel/power/Kconfig" 1310source "kernel/power/Kconfig"
@@ -1343,25 +1330,12 @@ source "drivers/cpufreq/Kconfig"
1343 1330
1344endmenu 1331endmenu
1345 1332
1346source "net/Kconfig"
1347
1348source "drivers/Kconfig"
1349
1350source "drivers/firmware/Kconfig" 1333source "drivers/firmware/Kconfig"
1351 1334
1352source "drivers/acpi/Kconfig" 1335source "drivers/acpi/Kconfig"
1353 1336
1354source "fs/Kconfig"
1355
1356source "arch/arm64/kvm/Kconfig" 1337source "arch/arm64/kvm/Kconfig"
1357 1338
1358source "arch/arm64/Kconfig.debug"
1359
1360source "security/Kconfig"
1361
1362source "crypto/Kconfig"
1363if CRYPTO 1339if CRYPTO
1364source "arch/arm64/crypto/Kconfig" 1340source "arch/arm64/crypto/Kconfig"
1365endif 1341endif
1366
1367source "lib/Kconfig"
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 @@
1menu "Kernel hacking"
2
3source "lib/Kconfig.debug"
4 1
5config ARM64_PTDUMP_CORE 2config ARM64_PTDUMP_CORE
6 def_bool n 3 def_bool n
@@ -97,5 +94,3 @@ config ARM64_RELOC_TEST
97 tristate "Relocation testing module" 94 tristate "Relocation testing module"
98 95
99source "drivers/hwtracing/coresight/Kconfig" 96source "drivers/hwtracing/coresight/Kconfig"
100
101endmenu
diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig
index bf59855628ac..a641b0bf1611 100644
--- a/arch/c6x/Kconfig
+++ b/arch/c6x/Kconfig
@@ -53,12 +53,8 @@ config C6X_BIG_KERNEL
53 53
54 If unsure, say N. 54 If unsure, say N.
55 55
56source "init/Kconfig"
57
58# Use the generic interrupt handling code in kernel/irq/ 56# Use the generic interrupt handling code in kernel/irq/
59 57
60source "kernel/Kconfig.freezer"
61
62config CMDLINE_BOOL 58config CMDLINE_BOOL
63 bool "Default bootloader kernel arguments" 59 bool "Default bootloader kernel arguments"
64 60
@@ -114,43 +110,6 @@ config KERNEL_RAM_BASE_ADDRESS
114 default 0xe0000000 if SOC_TMS320C6472 110 default 0xe0000000 if SOC_TMS320C6472
115 default 0x80000000 111 default 0x80000000
116 112
117source "mm/Kconfig"
118
119source "kernel/Kconfig.preempt"
120
121source "kernel/Kconfig.hz" 113source "kernel/Kconfig.hz"
122 114
123endmenu 115endmenu
124
125menu "Executable file formats"
126
127source "fs/Kconfig.binfmt"
128
129endmenu
130
131source "net/Kconfig"
132
133source "drivers/Kconfig"
134
135source "fs/Kconfig"
136
137source "security/Kconfig"
138
139source "crypto/Kconfig"
140
141source "lib/Kconfig"
142
143menu "Kernel hacking"
144
145source "lib/Kconfig.debug"
146
147config ACCESS_CHECK
148 bool "Check the user pointer address"
149 default y
150 help
151 Usually the pointer transfer from user space is checked to see if its
152 address is in the kernel space.
153
154 Say N here to disable that check to improve the performance.
155
156endmenu
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 @@
1# SPDX-License-Identifier: GPL-2.0
2
3config ACCESS_CHECK
4 bool "Check the user pointer address"
5 default y
6 help
7 Usually the pointer transfer from user space is checked to see if its
8 address is in the kernel space.
9
10 Say N here to disable that check to improve the performance.
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 091d6d04b5e5..5e89d40be8cd 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -48,40 +48,4 @@ config NR_CPUS
48 int 48 int
49 default 1 49 default 1
50 50
51source "init/Kconfig"
52
53source "kernel/Kconfig.freezer"
54
55source "arch/h8300/Kconfig.cpu" 51source "arch/h8300/Kconfig.cpu"
56
57menu "Kernel Features"
58
59source "kernel/Kconfig.preempt"
60
61source "mm/Kconfig"
62
63endmenu
64
65menu "Executable file formats"
66
67source "fs/Kconfig.binfmt"
68
69endmenu
70
71source "net/Kconfig"
72
73source "drivers/Kconfig"
74
75source "fs/Kconfig"
76
77menu "Kernel hacking"
78
79source "lib/Kconfig.debug"
80
81endmenu
82
83source "security/Kconfig"
84
85source "crypto/Kconfig"
86
87source "lib/Kconfig"
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 37adb2003033..89a4b22f34d9 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -4,6 +4,7 @@ comment "Linux Kernel Configuration for Hexagon"
4 4
5config HEXAGON 5config HEXAGON
6 def_bool y 6 def_bool y
7 select ARCH_NO_PREEMPT
7 select HAVE_OPROFILE 8 select HAVE_OPROFILE
8 # Other pending projects/to-do items. 9 # Other pending projects/to-do items.
9 # select HAVE_REGS_AND_STACK_ACCESS_API 10 # select HAVE_REGS_AND_STACK_ACCESS_API
@@ -146,26 +147,6 @@ config PAGE_SIZE_256KB
146 147
147endchoice 148endchoice
148 149
149source "mm/Kconfig"
150
151source "kernel/Kconfig.hz" 150source "kernel/Kconfig.hz"
152 151
153endmenu 152endmenu
154
155source "init/Kconfig"
156source "kernel/Kconfig.freezer"
157source "drivers/Kconfig"
158source "fs/Kconfig"
159
160menu "Executable File Formats"
161source "fs/Kconfig.binfmt"
162endmenu
163
164source "net/Kconfig"
165source "security/Kconfig"
166source "crypto/Kconfig"
167source "lib/Kconfig"
168
169menu "Kernel hacking"
170source "lib/Kconfig.debug"
171endmenu
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 02eb68d5d1c0..2bf4ef792f2c 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -4,10 +4,6 @@ config PGTABLE_LEVELS
4 range 3 4 if !IA64_PAGE_SIZE_64KB 4 range 3 4 if !IA64_PAGE_SIZE_64KB
5 default 3 5 default 3
6 6
7source "init/Kconfig"
8
9source "kernel/Kconfig.freezer"
10
11menu "Processor type and features" 7menu "Processor type and features"
12 8
13config IA64 9config IA64
@@ -369,10 +365,6 @@ config FORCE_CPEI_RETARGET
369 This option it useful to enable this feature on older BIOS's as well. 365 This option it useful to enable this feature on older BIOS's as well.
370 You can also enable this by using boot command line option force_cpei=1. 366 You can also enable this by using boot command line option force_cpei=1.
371 367
372source "kernel/Kconfig.preempt"
373
374source "mm/Kconfig"
375
376config ARCH_SELECT_MEMORY_MODEL 368config ARCH_SELECT_MEMORY_MODEL
377 def_bool y 369 def_bool y
378 370
@@ -533,8 +525,6 @@ config CRASH_DUMP
533 525
534source "drivers/firmware/Kconfig" 526source "drivers/firmware/Kconfig"
535 527
536source "fs/Kconfig.binfmt"
537
538endmenu 528endmenu
539 529
540menu "Power management and ACPI options" 530menu "Power management and ACPI options"
@@ -575,10 +565,6 @@ endmenu
575 565
576endif 566endif
577 567
578source "net/Kconfig"
579
580source "drivers/Kconfig"
581
582source "arch/ia64/hp/sim/Kconfig" 568source "arch/ia64/hp/sim/Kconfig"
583 569
584config MSPEC 570config MSPEC
@@ -589,13 +575,3 @@ config MSPEC
589 If you have an ia64 and you want to enable memory special 575 If you have an ia64 and you want to enable memory special
590 operations support (formerly known as fetchop), say Y here, 576 operations support (formerly known as fetchop), say Y here,
591 otherwise say N. 577 otherwise say N.
592
593source "fs/Kconfig"
594
595source "arch/ia64/Kconfig.debug"
596
597source "security/Kconfig"
598
599source "crypto/Kconfig"
600
601source "lib/Kconfig"
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 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2menu "Kernel hacking"
3
4source "lib/Kconfig.debug"
5 2
6choice 3choice
7 prompt "Physical memory granularity" 4 prompt "Physical memory granularity"
@@ -56,5 +53,3 @@ config IA64_DEBUG_IRQ
56 Selecting this option turns on bug checking for the IA-64 irq_save 53 Selecting this option turns on bug checking for the IA-64 irq_save
57 and restore instructions. It's useful for tracking down spinlock 54 and restore instructions. It's useful for tracking down spinlock
58 problems, but slow! If you're unsure, select N. 55 problems, but slow! If you're unsure, select N.
59
60endmenu
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index b29f93774d95..070553791e97 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -5,6 +5,7 @@ config M68K
5 select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA 5 select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA
6 select ARCH_MIGHT_HAVE_PC_PARPORT if ISA 6 select ARCH_MIGHT_HAVE_PC_PARPORT if ISA
7 select ARCH_NO_COHERENT_DMA_MMAP if !MMU 7 select ARCH_NO_COHERENT_DMA_MMAP if !MMU
8 select ARCH_NO_PREEMPT if !COLDFIRE
8 select HAVE_IDE 9 select HAVE_IDE
9 select HAVE_AOUT if MMU 10 select HAVE_AOUT if MMU
10 select HAVE_DEBUG_BUGVERBOSE 11 select HAVE_DEBUG_BUGVERBOSE
@@ -80,10 +81,6 @@ config PGTABLE_LEVELS
80 default 2 if SUN3 || COLDFIRE 81 default 2 if SUN3 || COLDFIRE
81 default 3 82 default 3
82 83
83source "init/Kconfig"
84
85source "kernel/Kconfig.freezer"
86
87config MMU 84config MMU
88 bool "MMU-based Paged Memory Management Support" 85 bool "MMU-based Paged Memory Management Support"
89 default y 86 default y
@@ -138,18 +135,6 @@ endmenu
138 135
139menu "Kernel Features" 136menu "Kernel Features"
140 137
141if COLDFIRE
142source "kernel/Kconfig.preempt"
143endif
144
145source "mm/Kconfig"
146
147endmenu
148
149menu "Executable file formats"
150
151source "fs/Kconfig.binfmt"
152
153endmenu 138endmenu
154 139
155if !MMU 140if !MMU
@@ -163,18 +148,4 @@ config PM
163endmenu 148endmenu
164endif 149endif
165 150
166source "net/Kconfig"
167
168source "drivers/Kconfig"
169
170source "arch/m68k/Kconfig.devices" 151source "arch/m68k/Kconfig.devices"
171
172source "fs/Kconfig"
173
174source "arch/m68k/Kconfig.debug"
175
176source "security/Kconfig"
177
178source "crypto/Kconfig"
179
180source "lib/Kconfig"
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 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2menu "Kernel hacking"
3
4source "lib/Kconfig.debug"
5 2
6config BOOTPARAM 3config BOOTPARAM
7 bool 'Compiled-in Kernel Boot Parameter' 4 bool 'Compiled-in Kernel Boot Parameter'
@@ -51,5 +48,3 @@ config BDM_DISABLE
51 Disable the ColdFire CPU's BDM signals. 48 Disable the ColdFire CPU's BDM signals.
52 49
53endif 50endif
54
55endmenu
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index d14782100088..6163a39ddeb6 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -1,5 +1,6 @@
1config MICROBLAZE 1config MICROBLAZE
2 def_bool y 2 def_bool y
3 select ARCH_NO_SWAP
3 select ARCH_HAS_GCOV_PROFILE_ALL 4 select ARCH_HAS_GCOV_PROFILE_ALL
4 select ARCH_MIGHT_HAVE_PC_PARPORT 5 select ARCH_MIGHT_HAVE_PC_PARPORT
5 select ARCH_NO_COHERENT_DMA_MMAP if !MMU 6 select ARCH_NO_COHERENT_DMA_MMAP if !MMU
@@ -52,9 +53,6 @@ config CPU_LITTLE_ENDIAN
52 53
53endchoice 54endchoice
54 55
55config SWAP
56 def_bool n
57
58config RWSEM_GENERIC_SPINLOCK 56config RWSEM_GENERIC_SPINLOCK
59 def_bool y 57 def_bool y
60 58
@@ -85,16 +83,10 @@ config STACKTRACE_SUPPORT
85config LOCKDEP_SUPPORT 83config LOCKDEP_SUPPORT
86 def_bool y 84 def_bool y
87 85
88source "init/Kconfig"
89
90source "kernel/Kconfig.freezer"
91
92source "arch/microblaze/Kconfig.platform" 86source "arch/microblaze/Kconfig.platform"
93 87
94menu "Processor type and features" 88menu "Processor type and features"
95 89
96source "kernel/Kconfig.preempt"
97
98source "kernel/Kconfig.hz" 90source "kernel/Kconfig.hz"
99 91
100config MMU 92config MMU
@@ -268,14 +260,6 @@ config MICROBLAZE_64K_PAGES
268 260
269endchoice 261endchoice
270 262
271source "mm/Kconfig"
272
273endmenu
274
275menu "Executable file formats"
276
277source "fs/Kconfig.binfmt"
278
279endmenu 263endmenu
280 264
281menu "Bus Options" 265menu "Bus Options"
@@ -299,17 +283,3 @@ config PCI_XILINX
299source "drivers/pci/Kconfig" 283source "drivers/pci/Kconfig"
300 284
301endmenu 285endmenu
302
303source "net/Kconfig"
304
305source "drivers/Kconfig"
306
307source "fs/Kconfig"
308
309source "arch/microblaze/Kconfig.debug"
310
311source "security/Kconfig"
312
313source "crypto/Kconfig"
314
315source "lib/Kconfig"
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 @@
1# For a description of the syntax of this configuration file, 1# For a description of the syntax of this configuration file,
2# see Documentation/kbuild/kconfig-language.txt. 2# see Documentation/kbuild/kconfig-language.txt.
3 3
4menu "Kernel hacking"
5
6config TRACE_IRQFLAGS_SUPPORT 4config TRACE_IRQFLAGS_SUPPORT
7 def_bool y 5 def_bool y
8
9source "lib/Kconfig.debug"
10
11endmenu
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 642a56e2a1ea..2af13b162e5e 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2635,8 +2635,6 @@ config HW_PERF_EVENTS
2635 Enable hardware performance counter support for perf events. If 2635 Enable hardware performance counter support for perf events. If
2636 disabled, perf events will use software events only. 2636 disabled, perf events will use software events only.
2637 2637
2638source "mm/Kconfig"
2639
2640config SMP 2638config SMP
2641 bool "Multi-Processing support" 2639 bool "Multi-Processing support"
2642 depends on SYS_SUPPORTS_SMP 2640 depends on SYS_SUPPORTS_SMP
@@ -2814,8 +2812,6 @@ config HZ
2814config SCHED_HRTICK 2812config SCHED_HRTICK
2815 def_bool HIGH_RES_TIMERS 2813 def_bool HIGH_RES_TIMERS
2816 2814
2817source "kernel/Kconfig.preempt"
2818
2819config KEXEC 2815config KEXEC
2820 bool "Kexec system call" 2816 bool "Kexec system call"
2821 select KEXEC_CORE 2817 select KEXEC_CORE
@@ -2991,10 +2987,6 @@ config PGTABLE_LEVELS
2991config MIPS_AUTO_PFN_OFFSET 2987config MIPS_AUTO_PFN_OFFSET
2992 bool 2988 bool
2993 2989
2994source "init/Kconfig"
2995
2996source "kernel/Kconfig.freezer"
2997
2998menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)" 2990menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
2999 2991
3000config HW_HAS_EISA 2992config HW_HAS_EISA
@@ -3127,10 +3119,6 @@ source "drivers/rapidio/Kconfig"
3127 3119
3128endmenu 3120endmenu
3129 3121
3130menu "Executable file formats"
3131
3132source "fs/Kconfig.binfmt"
3133
3134config TRAD_SIGNALS 3122config TRAD_SIGNALS
3135 bool 3123 bool
3136 3124
@@ -3176,8 +3164,6 @@ config BINFMT_ELF32
3176 default y if MIPS32_O32 || MIPS32_N32 3164 default y if MIPS32_O32 || MIPS32_N32
3177 select ELFCORE 3165 select ELFCORE
3178 3166
3179endmenu
3180
3181menu "Power management options" 3167menu "Power management options"
3182 3168
3183config ARCH_HIBERNATION_POSSIBLE 3169config ARCH_HIBERNATION_POSSIBLE
@@ -3205,20 +3191,6 @@ source "drivers/cpuidle/Kconfig"
3205 3191
3206endmenu 3192endmenu
3207 3193
3208source "net/Kconfig"
3209
3210source "drivers/Kconfig"
3211
3212source "drivers/firmware/Kconfig" 3194source "drivers/firmware/Kconfig"
3213 3195
3214source "fs/Kconfig"
3215
3216source "arch/mips/Kconfig.debug"
3217
3218source "security/Kconfig"
3219
3220source "crypto/Kconfig"
3221
3222source "lib/Kconfig"
3223
3224source "arch/mips/kvm/Kconfig" 3196source "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 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2menu "Kernel hacking"
3 2
4config TRACE_IRQFLAGS_SUPPORT 3config TRACE_IRQFLAGS_SUPPORT
5 bool 4 bool
6 default y 5 default y
7 6
8source "lib/Kconfig.debug"
9
10config EARLY_PRINTK 7config EARLY_PRINTK
11 bool "Early printk" if EXPERT 8 bool "Early printk" if EXPERT
12 depends on SYS_HAS_EARLY_PRINTK 9 depends on SYS_HAS_EARLY_PRINTK
@@ -155,5 +152,3 @@ config MIPS_CPS_NS16550_SHIFT
155 adjacent ns16550 registers in the system. 152 adjacent ns16550 registers in the system.
156 153
157endif # MIPS_CPS_NS16550_BOOL 154endif # MIPS_CPS_NS16550_BOOL
158
159endmenu
diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig
index 34f7222c5efe..1d4248fa55e9 100644
--- a/arch/nds32/Kconfig
+++ b/arch/nds32/Kconfig
@@ -71,8 +71,6 @@ config FIX_EARLYCON_MEM
71config PGTABLE_LEVELS 71config PGTABLE_LEVELS
72 default 2 72 default 2
73 73
74source "init/Kconfig"
75
76menu "System Type" 74menu "System Type"
77source "arch/nds32/Kconfig.cpu" 75source "arch/nds32/Kconfig.cpu"
78config NR_CPUS 76config NR_CPUS
@@ -90,24 +88,5 @@ config NDS32_BUILTIN_DTB
90endmenu 88endmenu
91 89
92menu "Kernel Features" 90menu "Kernel Features"
93source "kernel/Kconfig.preempt"
94source "kernel/Kconfig.freezer"
95source "mm/Kconfig"
96source "kernel/Kconfig.hz" 91source "kernel/Kconfig.hz"
97endmenu 92endmenu
98
99menu "Executable file formats"
100source "fs/Kconfig.binfmt"
101endmenu
102
103source "net/Kconfig"
104source "drivers/Kconfig"
105source "fs/Kconfig"
106
107menu "Kernel hacking"
108source "lib/Kconfig.debug"
109endmenu
110
111source "security/Kconfig"
112source "crypto/Kconfig"
113source "lib/Kconfig"
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 92035042cf62..f4ad1138e6b9 100644
--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig
@@ -3,6 +3,7 @@ config NIOS2
3 def_bool y 3 def_bool y
4 select ARCH_HAS_SYNC_DMA_FOR_CPU 4 select ARCH_HAS_SYNC_DMA_FOR_CPU
5 select ARCH_HAS_SYNC_DMA_FOR_DEVICE 5 select ARCH_HAS_SYNC_DMA_FOR_DEVICE
6 select ARCH_NO_SWAP
6 select DMA_NONCOHERENT_OPS 7 select DMA_NONCOHERENT_OPS
7 select TIMER_OF 8 select TIMER_OF
8 select GENERIC_ATOMIC64 9 select GENERIC_ATOMIC64
@@ -41,27 +42,16 @@ config HAS_DMA
41config FPU 42config FPU
42 def_bool n 43 def_bool n
43 44
44config SWAP
45 def_bool n
46
47config RWSEM_GENERIC_SPINLOCK 45config RWSEM_GENERIC_SPINLOCK
48 def_bool y 46 def_bool y
49 47
50config TRACE_IRQFLAGS_SUPPORT 48config TRACE_IRQFLAGS_SUPPORT
51 def_bool n 49 def_bool n
52 50
53source "init/Kconfig"
54
55menu "Kernel features" 51menu "Kernel features"
56 52
57source "kernel/Kconfig.preempt"
58
59source "kernel/Kconfig.freezer"
60
61source "kernel/Kconfig.hz" 53source "kernel/Kconfig.hz"
62 54
63source "mm/Kconfig"
64
65config FORCE_MAX_ZONEORDER 55config FORCE_MAX_ZONEORDER
66 int "Maximum zone order" 56 int "Maximum zone order"
67 range 9 20 57 range 9 20
@@ -198,23 +188,3 @@ config NIOS2_IO_REGION_BASE
198 default "0xe0000000" 188 default "0xe0000000"
199 189
200endmenu 190endmenu
201
202menu "Executable file formats"
203
204source "fs/Kconfig.binfmt"
205
206endmenu
207
208source "net/Kconfig"
209
210source "drivers/Kconfig"
211
212source "fs/Kconfig"
213
214source "arch/nios2/Kconfig.debug"
215
216source "security/Kconfig"
217
218source "crypto/Kconfig"
219
220source "lib/Kconfig"
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 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2menu "Kernel hacking"
3 2
4config TRACE_IRQFLAGS_SUPPORT 3config TRACE_IRQFLAGS_SUPPORT
5 def_bool y 4 def_bool y
6 5
7source "lib/Kconfig.debug"
8
9config DEBUG_STACK_USAGE 6config DEBUG_STACK_USAGE
10 bool "Enable stack utilization instrumentation" 7 bool "Enable stack utilization instrumentation"
11 depends on DEBUG_KERNEL 8 depends on DEBUG_KERNEL
@@ -24,5 +21,3 @@ config EARLY_PRINTK
24 This is useful for kernel debugging when your machine crashes very 21 This is useful for kernel debugging when your machine crashes very
25 early before the console code is initialized. 22 early before the console code is initialized.
26 You should normally say N here, unless you want to debug such a crash. 23 You should normally say N here, unless you want to debug such a crash.
27
28endmenu
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index dfb6a79ba7ff..ed5f32d8fbd8 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -69,10 +69,6 @@ config STACKTRACE_SUPPORT
69config LOCKDEP_SUPPORT 69config LOCKDEP_SUPPORT
70 def_bool y 70 def_bool y
71 71
72source "init/Kconfig"
73
74source "kernel/Kconfig.freezer"
75
76menu "Processor type and features" 72menu "Processor type and features"
77 73
78choice 74choice
@@ -144,8 +140,6 @@ config SMP
144 If you don't know what to do here, say N. 140 If you don't know what to do here, say N.
145 141
146source kernel/Kconfig.hz 142source kernel/Kconfig.hz
147source kernel/Kconfig.preempt
148source "mm/Kconfig"
149 143
150config OPENRISC_NO_SPR_SR_DSX 144config OPENRISC_NO_SPR_SR_DSX
151 bool "use SPR_SR_DSX software emulation" if OR1K_1200 145 bool "use SPR_SR_DSX software emulation" if OR1K_1200
@@ -203,27 +197,3 @@ config OPENRISC_ESR_EXCEPTION_BUG_CHECK
203endmenu 197endmenu
204 198
205endmenu 199endmenu
206
207menu "Executable file formats"
208
209source "fs/Kconfig.binfmt"
210
211endmenu
212
213source "net/Kconfig"
214
215source "drivers/Kconfig"
216
217source "fs/Kconfig"
218
219source "security/Kconfig"
220
221source "crypto/Kconfig"
222
223source "lib/Kconfig"
224
225menu "Kernel hacking"
226
227source "lib/Kconfig.debug"
228
229endmenu
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 e21751fb24aa..8e6d83f79e72 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -129,10 +129,6 @@ config PGTABLE_LEVELS
129config SYS_SUPPORTS_HUGETLBFS 129config SYS_SUPPORTS_HUGETLBFS
130 def_bool y if PA20 130 def_bool y if PA20
131 131
132source "init/Kconfig"
133
134source "kernel/Kconfig.freezer"
135
136 132
137menu "Processor type and features" 133menu "Processor type and features"
138 134
@@ -331,9 +327,7 @@ config NODES_SHIFT
331 default "3" 327 default "3"
332 depends on NEED_MULTIPLE_NODES 328 depends on NEED_MULTIPLE_NODES
333 329
334source "kernel/Kconfig.preempt"
335source "kernel/Kconfig.hz" 330source "kernel/Kconfig.hz"
336source "mm/Kconfig"
337 331
338config COMPAT 332config COMPAT
339 def_bool y 333 def_bool y
@@ -358,21 +352,6 @@ endmenu
358 352
359source "drivers/parisc/Kconfig" 353source "drivers/parisc/Kconfig"
360 354
361
362menu "Executable file formats"
363
364source "fs/Kconfig.binfmt"
365
366endmenu
367
368source "net/Kconfig"
369
370source "drivers/Kconfig"
371
372source "fs/Kconfig"
373
374source "arch/parisc/Kconfig.debug"
375
376config SECCOMP 355config SECCOMP
377 def_bool y 356 def_bool y
378 prompt "Enable seccomp to safely compute untrusted bytecode" 357 prompt "Enable seccomp to safely compute untrusted bytecode"
@@ -388,9 +367,3 @@ config SECCOMP
388 defined by each seccomp mode. 367 defined by each seccomp mode.
389 368
390 If unsure, say Y. Only embedded should say N here. 369 If unsure, say Y. Only embedded should say N here.
391
392source "security/Kconfig"
393
394source "crypto/Kconfig"
395
396source "lib/Kconfig"
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 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2menu "Kernel hacking"
3
4source "lib/Kconfig.debug"
5 2
6config TRACE_IRQFLAGS_SUPPORT 3config TRACE_IRQFLAGS_SUPPORT
7 def_bool y 4 def_bool y
8
9endmenu
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 9f2b75fe2c2d..1c10ff0406f2 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -383,10 +383,6 @@ config PGTABLE_LEVELS
383 default 3 if PPC_64K_PAGES && !PPC_BOOK3S_64 383 default 3 if PPC_64K_PAGES && !PPC_BOOK3S_64
384 default 4 384 default 4
385 385
386source "init/Kconfig"
387
388source "kernel/Kconfig.freezer"
389
390source "arch/powerpc/sysdev/Kconfig" 386source "arch/powerpc/sysdev/Kconfig"
391source "arch/powerpc/platforms/Kconfig" 387source "arch/powerpc/platforms/Kconfig"
392 388
@@ -397,8 +393,6 @@ config HIGHMEM
397 depends on PPC32 393 depends on PPC32
398 394
399source kernel/Kconfig.hz 395source kernel/Kconfig.hz
400source kernel/Kconfig.preempt
401source "fs/Kconfig.binfmt"
402 396
403config HUGETLB_PAGE_SIZE_VARIABLE 397config HUGETLB_PAGE_SIZE_VARIABLE
404 bool 398 bool
@@ -641,8 +635,6 @@ config ILLEGAL_POINTER_VALUE
641 default 0x5deadbeef0000000 if PPC64 635 default 0x5deadbeef0000000 if PPC64
642 default 0 636 default 0
643 637
644source "mm/Kconfig"
645
646config ARCH_MEMORY_PROBE 638config ARCH_MEMORY_PROBE
647 def_bool y 639 def_bool y
648 depends on MEMORY_HOTPLUG 640 depends on MEMORY_HOTPLUG
@@ -1201,20 +1193,6 @@ endif
1201config ARCH_RANDOM 1193config ARCH_RANDOM
1202 def_bool n 1194 def_bool n
1203 1195
1204source "net/Kconfig"
1205
1206source "drivers/Kconfig"
1207
1208source "fs/Kconfig"
1209
1210source "lib/Kconfig"
1211
1212source "arch/powerpc/Kconfig.debug"
1213
1214source "security/Kconfig"
1215
1216source "crypto/Kconfig"
1217
1218config PPC_LIB_RHEAP 1196config PPC_LIB_RHEAP
1219 bool 1197 bool
1220 1198
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 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2menu "Kernel hacking"
3
4source "lib/Kconfig.debug"
5 2
6config PPC_DISABLE_WERROR 3config PPC_DISABLE_WERROR
7 bool "Don't build arch/powerpc code with -Werror" 4 bool "Don't build arch/powerpc code with -Werror"
@@ -379,5 +376,3 @@ config PPC_FAST_ENDIAN_SWITCH
379 depends on DEBUG_KERNEL && PPC_BOOK3S_64 376 depends on DEBUG_KERNEL && PPC_BOOK3S_64
380 help 377 help
381 If you're unsure what this is, say N. 378 If you're unsure what this is, say N.
382
383endmenu
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 4764fdeb4f1f..a344980287a5 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -212,10 +212,6 @@ endmenu
212 212
213menu "Kernel type" 213menu "Kernel type"
214 214
215source "mm/Kconfig"
216
217source "kernel/Kconfig.preempt"
218
219source "kernel/Kconfig.hz" 215source "kernel/Kconfig.hz"
220 216
221endmenu 217endmenu
@@ -242,75 +238,8 @@ source "drivers/pci/Kconfig"
242 238
243endmenu 239endmenu
244 240
245source "init/Kconfig"
246
247source "kernel/Kconfig.freezer"
248
249menu "Executable file formats"
250
251source "fs/Kconfig.binfmt"
252
253endmenu
254
255menu "Power management options" 241menu "Power management options"
256 242
257source kernel/power/Kconfig 243source kernel/power/Kconfig
258 244
259endmenu 245endmenu
260
261source "net/Kconfig"
262
263source "drivers/Kconfig"
264
265source "fs/Kconfig"
266
267menu "Kernel hacking"
268
269config CMDLINE_BOOL
270 bool "Built-in kernel command line"
271 help
272 For most platforms, it is firmware or second stage bootloader
273 that by default specifies the kernel command line options.
274 However, it might be necessary or advantageous to either override
275 the default kernel command line or add a few extra options to it.
276 For such cases, this option allows hardcoding command line options
277 directly into the kernel.
278
279 For that, choose 'Y' here and fill in the extra boot parameters
280 in CONFIG_CMDLINE.
281
282 The built-in options will be concatenated to the default command
283 line if CMDLINE_FORCE is set to 'N'. Otherwise, the default
284 command line will be ignored and replaced by the built-in string.
285
286config CMDLINE
287 string "Built-in kernel command string"
288 depends on CMDLINE_BOOL
289 default ""
290 help
291 Supply command-line options at build time by entering them here.
292
293config CMDLINE_FORCE
294 bool "Built-in command line overrides bootloader arguments"
295 depends on CMDLINE_BOOL
296 help
297 Set this option to 'Y' to have the kernel ignore the bootloader
298 or firmware command line. Instead, the built-in command line
299 will be used exclusively.
300
301 If you don't know what to do here, say N.
302
303config EARLY_PRINTK
304 def_bool y
305
306source "lib/Kconfig.debug"
307
308config CMDLINE_BOOL
309 bool
310endmenu
311
312source "security/Kconfig"
313
314source "crypto/Kconfig"
315
316source "lib/Kconfig"
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 @@
1
2config CMDLINE_BOOL
3 bool "Built-in kernel command line"
4 help
5 For most platforms, it is firmware or second stage bootloader
6 that by default specifies the kernel command line options.
7 However, it might be necessary or advantageous to either override
8 the default kernel command line or add a few extra options to it.
9 For such cases, this option allows hardcoding command line options
10 directly into the kernel.
11
12 For that, choose 'Y' here and fill in the extra boot parameters
13 in CONFIG_CMDLINE.
14
15 The built-in options will be concatenated to the default command
16 line if CMDLINE_FORCE is set to 'N'. Otherwise, the default
17 command line will be ignored and replaced by the built-in string.
18
19config CMDLINE
20 string "Built-in kernel command string"
21 depends on CMDLINE_BOOL
22 default ""
23 help
24 Supply command-line options at build time by entering them here.
25
26config CMDLINE_FORCE
27 bool "Built-in command line overrides bootloader arguments"
28 depends on CMDLINE_BOOL
29 help
30 Set this option to 'Y' to have the kernel ignore the bootloader
31 or firmware command line. Instead, the built-in command line
32 will be used exclusively.
33
34 If you don't know what to do here, say N.
35
36config EARLY_PRINTK
37 def_bool y
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 515240576930..a6afa60074cb 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -184,10 +184,6 @@ config PGTABLE_LEVELS
184 int 184 int
185 default 5 185 default 5
186 186
187source "init/Kconfig"
188
189source "kernel/Kconfig.freezer"
190
191source "kernel/livepatch/Kconfig" 187source "kernel/livepatch/Kconfig"
192 188
193menu "Processor type and features" 189menu "Processor type and features"
@@ -515,8 +511,6 @@ config SCHED_TOPOLOGY
515 making when dealing with machines that have multi-threading, 511 making when dealing with machines that have multi-threading,
516 multiple cores or multiple books. 512 multiple cores or multiple books.
517 513
518source kernel/Kconfig.preempt
519
520source kernel/Kconfig.hz 514source kernel/Kconfig.hz
521 515
522config KEXEC 516config KEXEC
@@ -627,8 +621,6 @@ config FORCE_MAX_ZONEORDER
627 int 621 int
628 default "9" 622 default "9"
629 623
630source "mm/Kconfig"
631
632config MAX_PHYSMEM_BITS 624config MAX_PHYSMEM_BITS
633 int "Maximum size of supported physical memory in bits (42-53)" 625 int "Maximum size of supported physical memory in bits (42-53)"
634 range 42 53 626 range 42 53
@@ -798,10 +790,6 @@ config CRASH_DUMP
798 790
799endmenu 791endmenu
800 792
801menu "Executable file formats / Emulations"
802
803source "fs/Kconfig.binfmt"
804
805config SECCOMP 793config SECCOMP
806 def_bool y 794 def_bool y
807 prompt "Enable seccomp to safely compute untrusted bytecode" 795 prompt "Enable seccomp to safely compute untrusted bytecode"
@@ -819,8 +807,6 @@ config SECCOMP
819 807
820 If unsure, say Y. 808 If unsure, say Y.
821 809
822endmenu
823
824menu "Power Management" 810menu "Power Management"
825 811
826config ARCH_HIBERNATION_POSSIBLE 812config ARCH_HIBERNATION_POSSIBLE
@@ -830,30 +816,16 @@ source "kernel/power/Kconfig"
830 816
831endmenu 817endmenu
832 818
833source "net/Kconfig"
834
835config PCMCIA 819config PCMCIA
836 def_bool n 820 def_bool n
837 821
838config CCW 822config CCW
839 def_bool y 823 def_bool y
840 824
841source "drivers/Kconfig"
842
843config HAVE_PNETID 825config HAVE_PNETID
844 tristate 826 tristate
845 default (SMC || CCWGROUP) 827 default (SMC || CCWGROUP)
846 828
847source "fs/Kconfig"
848
849source "arch/s390/Kconfig.debug"
850
851source "security/Kconfig"
852
853source "crypto/Kconfig"
854
855source "lib/Kconfig"
856
857menu "Virtualization" 829menu "Virtualization"
858 830
859config PFAULT 831config 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 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2menu "Kernel hacking"
3 2
4config TRACE_IRQFLAGS_SUPPORT 3config TRACE_IRQFLAGS_SUPPORT
5 def_bool y 4 def_bool y
6 5
7source "lib/Kconfig.debug"
8
9config S390_PTDUMP 6config S390_PTDUMP
10 bool "Export kernel pagetable layout to userspace via debugfs" 7 bool "Export kernel pagetable layout to userspace via debugfs"
11 depends on DEBUG_KERNEL 8 depends on DEBUG_KERNEL
@@ -20,5 +17,3 @@ config S390_PTDUMP
20 17
21config EARLY_PRINTK 18config EARLY_PRINTK
22 def_bool y 19 def_bool y
23
24endmenu
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index da4db4b5359f..1fb7b6d72baf 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -170,10 +170,6 @@ config PGTABLE_LEVELS
170 default 3 if X2TLB 170 default 3 if X2TLB
171 default 2 171 default 2
172 172
173source "init/Kconfig"
174
175source "kernel/Kconfig.freezer"
176
177menu "System type" 173menu "System type"
178 174
179# 175#
@@ -715,8 +711,6 @@ config HOTPLUG_CPU
715 Say Y here to experiment with turning CPUs off and on. CPUs 711 Say Y here to experiment with turning CPUs off and on. CPUs
716 can be controlled through /sys/devices/system/cpu. 712 can be controlled through /sys/devices/system/cpu.
717 713
718source "kernel/Kconfig.preempt"
719
720config GUSA 714config GUSA
721 def_bool y 715 def_bool y
722 depends on !SMP && SUPERH32 716 depends on !SMP && SUPERH32
@@ -884,12 +878,6 @@ source "drivers/pcmcia/Kconfig"
884 878
885endmenu 879endmenu
886 880
887menu "Executable file formats"
888
889source "fs/Kconfig.binfmt"
890
891endmenu
892
893menu "Power management options (EXPERIMENTAL)" 881menu "Power management options (EXPERIMENTAL)"
894 882
895source "kernel/power/Kconfig" 883source "kernel/power/Kconfig"
@@ -897,17 +885,3 @@ source "kernel/power/Kconfig"
897source "drivers/cpuidle/Kconfig" 885source "drivers/cpuidle/Kconfig"
898 886
899endmenu 887endmenu
900
901source "net/Kconfig"
902
903source "drivers/Kconfig"
904
905source "fs/Kconfig"
906
907source "arch/sh/Kconfig.debug"
908
909source "security/Kconfig"
910
911source "crypto/Kconfig"
912
913source "lib/Kconfig"
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 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2menu "Kernel hacking"
3 2
4config TRACE_IRQFLAGS_SUPPORT 3config TRACE_IRQFLAGS_SUPPORT
5 def_bool y 4 def_bool y
6 5
7source "lib/Kconfig.debug"
8
9config SH_STANDARD_BIOS 6config SH_STANDARD_BIOS
10 bool "Use LinuxSH standard BIOS" 7 bool "Use LinuxSH standard BIOS"
11 depends on SUPERH32 8 depends on SUPERH32
@@ -88,5 +85,3 @@ config MCOUNT
88 def_bool y 85 def_bool y
89 depends on SUPERH32 86 depends on SUPERH32
90 depends on STACK_DEBUG || FUNCTION_TRACER 87 depends on STACK_DEBUG || FUNCTION_TRACER
91
92endmenu
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 50cdd1349015..02ed2df25a54 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -225,8 +225,6 @@ config HUGETLB_PAGE_SIZE_512MB
225 225
226endchoice 226endchoice
227 227
228source "mm/Kconfig"
229
230config SCHED_MC 228config SCHED_MC
231 bool "Multi-core scheduler support" 229 bool "Multi-core scheduler support"
232 depends on SMP 230 depends on SMP
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 0f535debf802..2d58c26bff9a 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -155,10 +155,6 @@ config PGTABLE_LEVELS
155config ARCH_SUPPORTS_UPROBES 155config ARCH_SUPPORTS_UPROBES
156 def_bool y if SPARC64 156 def_bool y if SPARC64
157 157
158source "init/Kconfig"
159
160source "kernel/Kconfig.freezer"
161
162menu "Processor type and features" 158menu "Processor type and features"
163 159
164config SMP 160config SMP
@@ -331,8 +327,6 @@ config FORCE_MAX_ZONEORDER
331 This config option is actually maximum order plus one. For example, 327 This config option is actually maximum order plus one. For example,
332 a value of 13 means that the largest free memory block is 2^12 pages. 328 a value of 13 means that the largest free memory block is 2^12 pages.
333 329
334source "mm/Kconfig"
335
336if SPARC64 330if SPARC64
337source "kernel/power/Kconfig" 331source "kernel/power/Kconfig"
338endif 332endif
@@ -355,8 +349,6 @@ config SCHED_MC
355 making when dealing with multi-core CPU chips at a cost of slightly 349 making when dealing with multi-core CPU chips at a cost of slightly
356 increased overhead in some places. If unsure say N here. 350 increased overhead in some places. If unsure say N here.
357 351
358source "kernel/Kconfig.preempt"
359
360config CMDLINE_BOOL 352config CMDLINE_BOOL
361 bool "Default bootloader kernel arguments" 353 bool "Default bootloader kernel arguments"
362 depends on SPARC64 354 depends on SPARC64
@@ -556,10 +548,6 @@ config SPARC64_PCI_MSI
556 548
557endmenu 549endmenu
558 550
559menu "Executable file formats"
560
561source "fs/Kconfig.binfmt"
562
563config COMPAT 551config COMPAT
564 bool 552 bool
565 depends on SPARC64 553 depends on SPARC64
@@ -574,20 +562,4 @@ config SYSVIPC_COMPAT
574 depends on COMPAT && SYSVIPC 562 depends on COMPAT && SYSVIPC
575 default y 563 default y
576 564
577endmenu
578
579source "net/Kconfig"
580
581source "drivers/Kconfig"
582
583source "drivers/sbus/char/Kconfig" 565source "drivers/sbus/char/Kconfig"
584
585source "fs/Kconfig"
586
587source "arch/sparc/Kconfig.debug"
588
589source "security/Kconfig"
590
591source "crypto/Kconfig"
592
593source "lib/Kconfig"
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 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2menu "Kernel hacking"
3 2
4config TRACE_IRQFLAGS_SUPPORT 3config TRACE_IRQFLAGS_SUPPORT
5 bool 4 bool
6 default y 5 default y
7 6
8source "lib/Kconfig.debug"
9
10config DEBUG_DCFLUSH 7config DEBUG_DCFLUSH
11 bool "D-cache flush debugging" 8 bool "D-cache flush debugging"
12 depends on SPARC64 && DEBUG_KERNEL 9 depends on SPARC64 && DEBUG_KERNEL
@@ -21,5 +18,3 @@ config FRAME_POINTER
21 bool 18 bool
22 depends on MCOUNT 19 depends on MCOUNT
23 default y 20 default y
24
25endmenu
diff --git a/arch/um/Kconfig.um b/arch/um/Kconfig
index 20da5a8ca949..6b9938919f0b 100644
--- a/arch/um/Kconfig.um
+++ b/arch/um/Kconfig
@@ -1,4 +1,70 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2
3menu "UML-specific options"
4
5config UML
6 bool
7 default y
8 select ARCH_HAS_KCOV
9 select ARCH_NO_PREEMPT
10 select HAVE_ARCH_AUDITSYSCALL
11 select HAVE_ARCH_SECCOMP_FILTER
12 select HAVE_UID16
13 select HAVE_FUTEX_CMPXCHG if FUTEX
14 select HAVE_DEBUG_KMEMLEAK
15 select GENERIC_IRQ_SHOW
16 select GENERIC_CPU_DEVICES
17 select GENERIC_CLOCKEVENTS
18 select HAVE_GCC_PLUGINS
19 select TTY # Needed for line.c
20
21config MMU
22 bool
23 default y
24
25config NO_IOMEM
26 def_bool y
27
28config ISA
29 bool
30
31config SBUS
32 bool
33
34config PCI
35 bool
36
37config PCMCIA
38 bool
39
40config TRACE_IRQFLAGS_SUPPORT
41 bool
42 default y
43
44config LOCKDEP_SUPPORT
45 bool
46 default y
47
48config STACKTRACE_SUPPORT
49 bool
50 default y
51 select STACKTRACE
52
53config GENERIC_CALIBRATE_DELAY
54 bool
55 default y
56
57config HZ
58 int
59 default 100
60
61config NR_CPUS
62 int
63 range 1 1
64 default 1
65
66source "arch/$(HEADER_ARCH)/um/Kconfig"
67
2config STATIC_LINK 68config STATIC_LINK
3 bool "Force a static link" 69 bool "Force a static link"
4 default n 70 default n
@@ -10,8 +76,6 @@ config STATIC_LINK
10 Additionally, this option enables using higher memory spaces (up to 76 Additionally, this option enables using higher memory spaces (up to
11 2.75G) for UML. 77 2.75G) for UML.
12 78
13source "mm/Kconfig"
14
15config LD_SCRIPT_STATIC 79config LD_SCRIPT_STATIC
16 bool 80 bool
17 default y 81 default y
@@ -23,8 +87,6 @@ config LD_SCRIPT_DYN
23 depends on !LD_SCRIPT_STATIC 87 depends on !LD_SCRIPT_STATIC
24 select MODULE_REL_CRCS if MODVERSIONS 88 select MODULE_REL_CRCS if MODVERSIONS
25 89
26source "fs/Kconfig.binfmt"
27
28config HOSTFS 90config HOSTFS
29 tristate "Host filesystem" 91 tristate "Host filesystem"
30 help 92 help
@@ -122,3 +184,7 @@ config SECCOMP
122 defined by each seccomp mode. 184 defined by each seccomp mode.
123 185
124 If unsure, say Y. 186 If unsure, say Y.
187
188endmenu
189
190source "arch/um/drivers/Kconfig"
diff --git a/arch/um/Kconfig.char b/arch/um/Kconfig.char
deleted file mode 100644
index f184bde7030e..000000000000
--- a/arch/um/Kconfig.char
+++ /dev/null
@@ -1,124 +0,0 @@
1# SPDX-License-Identifier: GPL-2.0
2menu "UML Character Devices"
3
4config STDERR_CONSOLE
5 bool "stderr console"
6 default y
7 help
8 console driver which dumps all printk messages to stderr.
9
10config SSL
11 bool "Virtual serial line"
12 help
13 The User-Mode Linux environment allows you to create virtual serial
14 lines on the UML that are usually made to show up on the host as
15 ttys or ptys.
16
17 See <http://user-mode-linux.sourceforge.net/old/input.html> for more
18 information and command line examples of how to use this facility.
19
20 Unless you have a specific reason for disabling this, say Y.
21
22config NULL_CHAN
23 bool "null channel support"
24 help
25 This option enables support for attaching UML consoles and serial
26 lines to a device similar to /dev/null. Data written to it disappears
27 and there is never any data to be read.
28
29config PORT_CHAN
30 bool "port channel support"
31 help
32 This option enables support for attaching UML consoles and serial
33 lines to host portals. They may be accessed with 'telnet <host>
34 <port number>'. Any number of consoles and serial lines may be
35 attached to a single portal, although what UML device you get when
36 you telnet to that portal will be unpredictable.
37 It is safe to say 'Y' here.
38
39config PTY_CHAN
40 bool "pty channel support"
41 help
42 This option enables support for attaching UML consoles and serial
43 lines to host pseudo-terminals. Access to both traditional
44 pseudo-terminals (/dev/pty*) and pts pseudo-terminals are controlled
45 with this option. The assignment of UML devices to host devices
46 will be announced in the kernel message log.
47 It is safe to say 'Y' here.
48
49config TTY_CHAN
50 bool "tty channel support"
51 help
52 This option enables support for attaching UML consoles and serial
53 lines to host terminals. Access to both virtual consoles
54 (/dev/tty*) and the slave side of pseudo-terminals (/dev/ttyp* and
55 /dev/pts/*) are controlled by this option.
56 It is safe to say 'Y' here.
57
58config XTERM_CHAN
59 bool "xterm channel support"
60 help
61 This option enables support for attaching UML consoles and serial
62 lines to xterms. Each UML device so assigned will be brought up in
63 its own xterm.
64 It is safe to say 'Y' here.
65
66config NOCONFIG_CHAN
67 bool
68 default !(XTERM_CHAN && TTY_CHAN && PTY_CHAN && PORT_CHAN && NULL_CHAN)
69
70config CON_ZERO_CHAN
71 string "Default main console channel initialization"
72 default "fd:0,fd:1"
73 help
74 This is the string describing the channel to which the main console
75 will be attached by default. This value can be overridden from the
76 command line. The default value is "fd:0,fd:1", which attaches the
77 main console to stdin and stdout.
78 It is safe to leave this unchanged.
79
80config CON_CHAN
81 string "Default console channel initialization"
82 default "xterm"
83 help
84 This is the string describing the channel to which all consoles
85 except the main console will be attached by default. This value can
86 be overridden from the command line. The default value is "xterm",
87 which brings them up in xterms.
88 It is safe to leave this unchanged, although you may wish to change
89 this if you expect the UML that you build to be run in environments
90 which don't have X or xterm available.
91
92config SSL_CHAN
93 string "Default serial line channel initialization"
94 default "pty"
95 help
96 This is the string describing the channel to which the serial lines
97 will be attached by default. This value can be overridden from the
98 command line. The default value is "pty", which attaches them to
99 traditional pseudo-terminals.
100 It is safe to leave this unchanged, although you may wish to change
101 this if you expect the UML that you build to be run in environments
102 which don't have a set of /dev/pty* devices.
103
104config UML_SOUND
105 tristate "Sound support"
106 help
107 This option enables UML sound support. If enabled, it will pull in
108 soundcore and the UML hostaudio relay, which acts as a intermediary
109 between the host's dsp and mixer devices and the UML sound system.
110 It is safe to say 'Y' here.
111
112config SOUND
113 tristate
114 default UML_SOUND
115
116config SOUND_OSS_CORE
117 bool
118 default UML_SOUND
119
120config HOSTAUDIO
121 tristate
122 default UML_SOUND
123
124endmenu
diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
deleted file mode 100644
index 07f84c842cc3..000000000000
--- a/arch/um/Kconfig.common
+++ /dev/null
@@ -1,60 +0,0 @@
1# SPDX-License-Identifier: GPL-2.0
2config UML
3 bool
4 default y
5 select ARCH_HAS_KCOV
6 select HAVE_ARCH_AUDITSYSCALL
7 select HAVE_ARCH_SECCOMP_FILTER
8 select HAVE_UID16
9 select HAVE_FUTEX_CMPXCHG if FUTEX
10 select HAVE_DEBUG_KMEMLEAK
11 select GENERIC_IRQ_SHOW
12 select GENERIC_CPU_DEVICES
13 select GENERIC_CLOCKEVENTS
14 select HAVE_GCC_PLUGINS
15 select TTY # Needed for line.c
16
17config MMU
18 bool
19 default y
20
21config NO_IOMEM
22 def_bool y
23
24config ISA
25 bool
26
27config SBUS
28 bool
29
30config PCI
31 bool
32
33config PCMCIA
34 bool
35
36config TRACE_IRQFLAGS_SUPPORT
37 bool
38 default y
39
40config LOCKDEP_SUPPORT
41 bool
42 default y
43
44config STACKTRACE_SUPPORT
45 bool
46 default y
47 select STACKTRACE
48
49config GENERIC_CALIBRATE_DELAY
50 bool
51 default y
52
53config HZ
54 int
55 default 100
56
57config NR_CPUS
58 int
59 range 1 1
60 default 1
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 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2menu "Kernel hacking"
3
4source "lib/Kconfig.debug"
5 2
6config GPROF 3config GPROF
7 bool "Enable gprof support" 4 bool "Enable gprof support"
@@ -37,5 +34,3 @@ config EARLY_PRINTK
37 34
38 This is useful for kernel debugging when your machine crashes very 35 This is useful for kernel debugging when your machine crashes very
39 early before the console code is initialized. 36 early before the console code is initialized.
40
41endmenu
diff --git a/arch/um/Kconfig.rest b/arch/um/Kconfig.rest
deleted file mode 100644
index 08327b9c0cbe..000000000000
--- a/arch/um/Kconfig.rest
+++ /dev/null
@@ -1,22 +0,0 @@
1# SPDX-License-Identifier: GPL-2.0
2source "init/Kconfig"
3
4source "kernel/Kconfig.freezer"
5
6source "arch/um/Kconfig.char"
7
8source "drivers/Kconfig"
9
10source "net/Kconfig"
11
12source "arch/um/Kconfig.net"
13
14source "fs/Kconfig"
15
16source "security/Kconfig"
17
18source "crypto/Kconfig"
19
20source "lib/Kconfig"
21
22source "arch/um/Kconfig.debug"
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 306ee51c189f..44ddc3e8fa66 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -113,8 +113,6 @@ define archhelp
113 echo ' find in the kernel root.' 113 echo ' find in the kernel root.'
114endef 114endef
115 115
116KBUILD_KCONFIG := $(HOST_DIR)/um/Kconfig
117
118archheaders: 116archheaders:
119 $(Q)$(MAKE) -f $(srctree)/Makefile ARCH=$(HEADER_ARCH) asm-generic archheaders 117 $(Q)$(MAKE) -f $(srctree)/Makefile ARCH=$(HEADER_ARCH) asm-generic archheaders
120 118
@@ -169,4 +167,4 @@ endef
169include/generated/user_constants.h: $(HOST_DIR)/um/user-offsets.s 167include/generated/user_constants.h: $(HOST_DIR)/um/user-offsets.s
170 $(call filechk,gen-asm-offsets) 168 $(call filechk,gen-asm-offsets)
171 169
172export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS DEV_NULL_PATH 170export HEADER_ARCH SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS DEV_NULL_PATH
diff --git a/arch/um/Kconfig.net b/arch/um/drivers/Kconfig
index c390f3deb0dc..2b1aaf7755aa 100644
--- a/arch/um/Kconfig.net
+++ b/arch/um/drivers/Kconfig
@@ -1,5 +1,129 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2 2
3menu "UML Character Devices"
4
5config STDERR_CONSOLE
6 bool "stderr console"
7 default y
8 help
9 console driver which dumps all printk messages to stderr.
10
11config SSL
12 bool "Virtual serial line"
13 help
14 The User-Mode Linux environment allows you to create virtual serial
15 lines on the UML that are usually made to show up on the host as
16 ttys or ptys.
17
18 See <http://user-mode-linux.sourceforge.net/old/input.html> for more
19 information and command line examples of how to use this facility.
20
21 Unless you have a specific reason for disabling this, say Y.
22
23config NULL_CHAN
24 bool "null channel support"
25 help
26 This option enables support for attaching UML consoles and serial
27 lines to a device similar to /dev/null. Data written to it disappears
28 and there is never any data to be read.
29
30config PORT_CHAN
31 bool "port channel support"
32 help
33 This option enables support for attaching UML consoles and serial
34 lines to host portals. They may be accessed with 'telnet <host>
35 <port number>'. Any number of consoles and serial lines may be
36 attached to a single portal, although what UML device you get when
37 you telnet to that portal will be unpredictable.
38 It is safe to say 'Y' here.
39
40config PTY_CHAN
41 bool "pty channel support"
42 help
43 This option enables support for attaching UML consoles and serial
44 lines to host pseudo-terminals. Access to both traditional
45 pseudo-terminals (/dev/pty*) and pts pseudo-terminals are controlled
46 with this option. The assignment of UML devices to host devices
47 will be announced in the kernel message log.
48 It is safe to say 'Y' here.
49
50config TTY_CHAN
51 bool "tty channel support"
52 help
53 This option enables support for attaching UML consoles and serial
54 lines to host terminals. Access to both virtual consoles
55 (/dev/tty*) and the slave side of pseudo-terminals (/dev/ttyp* and
56 /dev/pts/*) are controlled by this option.
57 It is safe to say 'Y' here.
58
59config XTERM_CHAN
60 bool "xterm channel support"
61 help
62 This option enables support for attaching UML consoles and serial
63 lines to xterms. Each UML device so assigned will be brought up in
64 its own xterm.
65 It is safe to say 'Y' here.
66
67config NOCONFIG_CHAN
68 bool
69 default !(XTERM_CHAN && TTY_CHAN && PTY_CHAN && PORT_CHAN && NULL_CHAN)
70
71config CON_ZERO_CHAN
72 string "Default main console channel initialization"
73 default "fd:0,fd:1"
74 help
75 This is the string describing the channel to which the main console
76 will be attached by default. This value can be overridden from the
77 command line. The default value is "fd:0,fd:1", which attaches the
78 main console to stdin and stdout.
79 It is safe to leave this unchanged.
80
81config CON_CHAN
82 string "Default console channel initialization"
83 default "xterm"
84 help
85 This is the string describing the channel to which all consoles
86 except the main console will be attached by default. This value can
87 be overridden from the command line. The default value is "xterm",
88 which brings them up in xterms.
89 It is safe to leave this unchanged, although you may wish to change
90 this if you expect the UML that you build to be run in environments
91 which don't have X or xterm available.
92
93config SSL_CHAN
94 string "Default serial line channel initialization"
95 default "pty"
96 help
97 This is the string describing the channel to which the serial lines
98 will be attached by default. This value can be overridden from the
99 command line. The default value is "pty", which attaches them to
100 traditional pseudo-terminals.
101 It is safe to leave this unchanged, although you may wish to change
102 this if you expect the UML that you build to be run in environments
103 which don't have a set of /dev/pty* devices.
104
105config UML_SOUND
106 tristate "Sound support"
107 help
108 This option enables UML sound support. If enabled, it will pull in
109 soundcore and the UML hostaudio relay, which acts as a intermediary
110 between the host's dsp and mixer devices and the UML sound system.
111 It is safe to say 'Y' here.
112
113config SOUND
114 tristate
115 default UML_SOUND
116
117config SOUND_OSS_CORE
118 bool
119 default UML_SOUND
120
121config HOSTAUDIO
122 tristate
123 default UML_SOUND
124
125endmenu
126
3menu "UML Network Devices" 127menu "UML Network Devices"
4 depends on NET 128 depends on NET
5 129
@@ -211,4 +335,3 @@ config UML_NET_SLIRP
211 Startup example: "eth0=slirp,FE:FD:01:02:03:04,/usr/local/bin/slirp" 335 Startup example: "eth0=slirp,FE:FD:01:02:03:04,/usr/local/bin/slirp"
212 336
213endmenu 337endmenu
214
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 03f991e44288..60eae744d8fd 100644
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -63,10 +63,6 @@ config ARCH_MAY_HAVE_PC_FDC
63config ZONE_DMA 63config ZONE_DMA
64 def_bool y 64 def_bool y
65 65
66source "init/Kconfig"
67
68source "kernel/Kconfig.freezer"
69
70menu "System Type" 66menu "System Type"
71 67
72config MMU 68config MMU
@@ -139,12 +135,8 @@ endmenu
139 135
140menu "Kernel Features" 136menu "Kernel Features"
141 137
142source "kernel/Kconfig.preempt"
143
144source "kernel/Kconfig.hz" 138source "kernel/Kconfig.hz"
145 139
146source "mm/Kconfig"
147
148config LEDS 140config LEDS
149 def_bool y 141 def_bool y
150 depends on GPIOLIB 142 depends on GPIOLIB
@@ -181,12 +173,6 @@ config CMDLINE_FORCE
181 173
182endmenu 174endmenu
183 175
184menu "Userspace binary formats"
185
186source "fs/Kconfig.binfmt"
187
188endmenu
189
190menu "Power management options" 176menu "Power management options"
191 177
192source "kernel/power/Kconfig" 178source "kernel/power/Kconfig"
@@ -201,8 +187,6 @@ config ARCH_HIBERNATION_POSSIBLE
201 187
202endmenu 188endmenu
203 189
204source "net/Kconfig"
205
206if ARCH_PUV3 190if ARCH_PUV3
207 191
208config PUV3_GPIO 192config PUV3_GPIO
@@ -236,15 +220,3 @@ endmenu
236endif 220endif
237 221
238endif 222endif
239
240source "drivers/Kconfig"
241
242source "fs/Kconfig"
243
244source "arch/unicore32/Kconfig.debug"
245
246source "security/Kconfig"
247
248source "crypto/Kconfig"
249
250source "lib/Kconfig"
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 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2menu "Kernel hacking"
3
4source "lib/Kconfig.debug"
5 2
6config EARLY_PRINTK 3config EARLY_PRINTK
7 def_bool DEBUG_OCD 4 def_bool DEBUG_OCD
@@ -30,5 +27,3 @@ config DEBUG_OCD
30 help 27 help
31 Say Y here if you want the debug print routines to direct their 28 Say Y here if you want the debug print routines to direct their
32 output to the UniCore On-Chip-Debugger channel using CP #1. 29 output to the UniCore On-Chip-Debugger channel using CP #1.
33
34endmenu
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6d36e6b4b13a..b0312f8947ce 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -347,8 +347,6 @@ config PGTABLE_LEVELS
347 default 3 if X86_PAE 347 default 3 if X86_PAE
348 default 2 348 default 2
349 349
350source "init/Kconfig"
351
352config CC_HAS_SANE_STACKPROTECTOR 350config CC_HAS_SANE_STACKPROTECTOR
353 bool 351 bool
354 default $(success,$(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC)) if 64BIT 352 default $(success,$(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC)) if 64BIT
@@ -357,8 +355,6 @@ config CC_HAS_SANE_STACKPROTECTOR
357 We have to make sure stack protector is unconditionally disabled if 355 We have to make sure stack protector is unconditionally disabled if
358 the compiler produces broken code. 356 the compiler produces broken code.
359 357
360source "kernel/Kconfig.freezer"
361
362menu "Processor type and features" 358menu "Processor type and features"
363 359
364config ZONE_DMA 360config ZONE_DMA
@@ -1045,8 +1041,6 @@ config SCHED_MC_PRIO
1045 1041
1046 If unsure say Y here. 1042 If unsure say Y here.
1047 1043
1048source "kernel/Kconfig.preempt"
1049
1050config UP_LATE_INIT 1044config UP_LATE_INIT
1051 def_bool y 1045 def_bool y
1052 depends on !SMP && X86_LOCAL_APIC 1046 depends on !SMP && X86_LOCAL_APIC
@@ -1640,8 +1634,6 @@ config ILLEGAL_POINTER_VALUE
1640 default 0 if X86_32 1634 default 0 if X86_32
1641 default 0xdead000000000000 if X86_64 1635 default 0xdead000000000000 if X86_64
1642 1636
1643source "mm/Kconfig"
1644
1645config X86_PMEM_LEGACY_DEVICE 1637config X86_PMEM_LEGACY_DEVICE
1646 bool 1638 bool
1647 1639
@@ -2867,9 +2859,7 @@ config X86_SYSFB
2867endmenu 2859endmenu
2868 2860
2869 2861
2870menu "Executable file formats / Emulations" 2862menu "Binary Emulations"
2871
2872source "fs/Kconfig.binfmt"
2873 2863
2874config IA32_EMULATION 2864config IA32_EMULATION
2875 bool "IA32 Emulation" 2865 bool "IA32 Emulation"
@@ -2939,20 +2929,6 @@ config X86_DMA_REMAP
2939config HAVE_GENERIC_GUP 2929config HAVE_GENERIC_GUP
2940 def_bool y 2930 def_bool y
2941 2931
2942source "net/Kconfig"
2943
2944source "drivers/Kconfig"
2945
2946source "drivers/firmware/Kconfig" 2932source "drivers/firmware/Kconfig"
2947 2933
2948source "fs/Kconfig"
2949
2950source "arch/x86/Kconfig.debug"
2951
2952source "security/Kconfig"
2953
2954source "crypto/Kconfig"
2955
2956source "arch/x86/kvm/Kconfig" 2934source "arch/x86/kvm/Kconfig"
2957
2958source "lib/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 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2menu "Kernel hacking"
3 2
4config TRACE_IRQFLAGS_SUPPORT 3config TRACE_IRQFLAGS_SUPPORT
5 def_bool y 4 def_bool y
6 5
7source "lib/Kconfig.debug"
8
9config EARLY_PRINTK_USB 6config EARLY_PRINTK_USB
10 bool 7 bool
11 8
@@ -410,5 +407,3 @@ endchoice
410config FRAME_POINTER 407config FRAME_POINTER
411 depends on !UNWINDER_ORC && !UNWINDER_GUESS 408 depends on !UNWINDER_ORC && !UNWINDER_GUESS
412 bool 409 bool
413
414endmenu
diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig
index 9d529f22fd9d..f518b4744ff8 100644
--- a/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@ -1,13 +1,4 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2mainmenu "User Mode Linux/$(SUBARCH) $(KERNELVERSION) Kernel Configuration"
3
4comment "Compiler: $(CC_VERSION_TEXT)"
5
6source "scripts/Kconfig.include"
7
8source "arch/um/Kconfig.common"
9
10menu "UML-specific options"
11 2
12menu "Host processor type and features" 3menu "Host processor type and features"
13 4
@@ -66,9 +57,3 @@ config ARCH_REUSE_HOST_VSYSCALL_AREA
66 57
67config GENERIC_HWEIGHT 58config GENERIC_HWEIGHT
68 def_bool y 59 def_bool y
69
70source "arch/um/Kconfig.um"
71
72endmenu
73
74source "arch/um/Kconfig.rest"
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index d575e8701955..801491e98890 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -60,9 +60,6 @@ config HZ
60 int 60 int
61 default 100 61 default 100
62 62
63source "init/Kconfig"
64source "kernel/Kconfig.freezer"
65
66config LOCKDEP_SUPPORT 63config LOCKDEP_SUPPORT
67 def_bool y 64 def_bool y
68 65
@@ -176,8 +173,6 @@ config XTENSA_UNALIGNED_USER
176 173
177 Say Y here to enable unaligned memory access in user space. 174 Say Y here to enable unaligned memory access in user space.
178 175
179source "kernel/Kconfig.preempt"
180
181config HAVE_SMP 176config HAVE_SMP
182 bool "System Supports SMP (MX)" 177 bool "System Supports SMP (MX)"
183 depends on XTENSA_VARIANT_CUSTOM 178 depends on XTENSA_VARIANT_CUSTOM
@@ -491,8 +486,6 @@ config SIMDISK1_FILENAME
491 Another simulated disk in a host file for a buildroot-independent 486 Another simulated disk in a host file for a buildroot-independent
492 storage. 487 storage.
493 488
494source "mm/Kconfig"
495
496config FORCE_MAX_ZONEORDER 489config FORCE_MAX_ZONEORDER
497 int "Maximum zone order" 490 int "Maximum zone order"
498 default "11" 491 default "11"
@@ -567,30 +560,8 @@ config XTFPGA_LCD_8BIT_ACCESS
567 560
568endmenu 561endmenu
569 562
570menu "Executable file formats"
571
572source "fs/Kconfig.binfmt"
573
574endmenu
575
576menu "Power management options" 563menu "Power management options"
577 564
578source "kernel/power/Kconfig" 565source "kernel/power/Kconfig"
579 566
580endmenu 567endmenu
581
582source "net/Kconfig"
583
584source "drivers/Kconfig"
585
586source "fs/Kconfig"
587
588source "arch/xtensa/Kconfig.debug"
589
590source "security/Kconfig"
591
592source "crypto/Kconfig"
593
594source "lib/Kconfig"
595
596
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 @@
1# SPDX-License-Identifier: GPL-2.0 1# SPDX-License-Identifier: GPL-2.0
2menu "Kernel hacking"
3
4source "lib/Kconfig.debug"
5 2
6config DEBUG_TLB_SANITY 3config DEBUG_TLB_SANITY
7 bool "Debug TLB sanity" 4 bool "Debug TLB sanity"
@@ -34,5 +31,3 @@ config S32C1I_SELFTEST
34 It is easy to make wrong hardware configuration, this test should catch it early. 31 It is easy to make wrong hardware configuration, this test should catch it early.
35 32
36 Say 'N' on stable hardware. 33 Say 'N' on stable hardware.
37
38endmenu
diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
index 56df483de619..b795f8da81f3 100644
--- a/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
@@ -1,3 +1,6 @@
1
2menu "Executable file formats"
3
1config BINFMT_ELF 4config BINFMT_ELF
2 bool "Kernel support for ELF binaries" 5 bool "Kernel support for ELF binaries"
3 depends on MMU 6 depends on MMU
@@ -187,3 +190,5 @@ config COREDUMP
187 This option enables support for performing core dumps. You almost 190 This option enables support for performing core dumps. You almost
188 certainly want to say Y here. Not necessary on systems that never 191 certainly want to say Y here. Not necessary on systems that never
189 need debugging or only ever run flawless code. 192 need debugging or only ever run flawless code.
193
194endmenu
diff --git a/init/Kconfig b/init/Kconfig
index 74dd4d2067a2..4dc783023e43 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -240,9 +240,16 @@ config DEFAULT_HOSTNAME
240 but you may wish to use a different default here to make a minimal 240 but you may wish to use a different default here to make a minimal
241 system more usable with less configuration. 241 system more usable with less configuration.
242 242
243#
244# For some reason microblaze and nios2 hard code SWAP=n. Hopefully we can
245# add proper SWAP support to them, in which case this can be remove.
246#
247config ARCH_NO_SWAP
248 bool
249
243config SWAP 250config SWAP
244 bool "Support for paging of anonymous memory (swap)" 251 bool "Support for paging of anonymous memory (swap)"
245 depends on MMU && BLOCK 252 depends on MMU && BLOCK && !ARCH_NO_SWAP
246 default y 253 default y
247 help 254 help
248 This option allows you to choose whether you want to have support 255 This option allows you to choose whether you want to have support
@@ -341,6 +348,7 @@ config AUDIT_TREE
341 348
342source "kernel/irq/Kconfig" 349source "kernel/irq/Kconfig"
343source "kernel/time/Kconfig" 350source "kernel/time/Kconfig"
351source "kernel/Kconfig.preempt"
344 352
345menu "CPU/Task time and stats accounting" 353menu "CPU/Task time and stats accounting"
346 354
@@ -1736,10 +1744,10 @@ config PROFILING
1736config TRACEPOINTS 1744config TRACEPOINTS
1737 bool 1745 bool
1738 1746
1739source "arch/Kconfig"
1740
1741endmenu # General setup 1747endmenu # General setup
1742 1748
1749source "arch/Kconfig"
1750
1743config RT_MUTEXES 1751config RT_MUTEXES
1744 bool 1752 bool
1745 1753
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
18 18
19config PREEMPT_VOLUNTARY 19config PREEMPT_VOLUNTARY
20 bool "Voluntary Kernel Preemption (Desktop)" 20 bool "Voluntary Kernel Preemption (Desktop)"
21 depends on !ARCH_NO_PREEMPT
21 help 22 help
22 This option reduces the latency of the kernel by adding more 23 This option reduces the latency of the kernel by adding more
23 "explicit preemption points" to the kernel code. These new 24 "explicit preemption points" to the kernel code. These new
@@ -35,6 +36,7 @@ config PREEMPT_VOLUNTARY
35 36
36config PREEMPT 37config PREEMPT
37 bool "Preemptible Kernel (Low-Latency Desktop)" 38 bool "Preemptible Kernel (Low-Latency Desktop)"
39 depends on !ARCH_NO_PREEMPT
38 select PREEMPT_COUNT 40 select PREEMPT_COUNT
39 select UNINLINE_SPIN_UNLOCK if !ARCH_INLINE_SPIN_UNLOCK 41 select UNINLINE_SPIN_UNLOCK if !ARCH_INLINE_SPIN_UNLOCK
40 help 42 help
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index ce5a45e46885..da194bad1247 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1,3 +1,5 @@
1menu "Kernel hacking"
2
1menu "printk and dmesg options" 3menu "printk and dmesg options"
2 4
3config PRINTK_TIME 5config PRINTK_TIME
@@ -1204,6 +1206,7 @@ config DEBUG_ATOMIC_SLEEP
1204 bool "Sleep inside atomic section checking" 1206 bool "Sleep inside atomic section checking"
1205 select PREEMPT_COUNT 1207 select PREEMPT_COUNT
1206 depends on DEBUG_KERNEL 1208 depends on DEBUG_KERNEL
1209 depends on !ARCH_NO_PREEMPT
1207 help 1210 help
1208 If you say Y here, various routines which may sleep will become very 1211 If you say Y here, various routines which may sleep will become very
1209 noisy if they are called inside atomic sections: when a spinlock is 1212 noisy if they are called inside atomic sections: when a spinlock is
@@ -2045,3 +2048,7 @@ config IO_STRICT_DEVMEM
2045 if the driver using a given range cannot be disabled. 2048 if the driver using a given range cannot be disabled.
2046 2049
2047 If in doubt, say Y. 2050 If in doubt, say Y.
2051
2052source "arch/$(SRCARCH)/Kconfig.debug"
2053
2054endmenu # Kernel hacking
diff --git a/mm/Kconfig b/mm/Kconfig
index ce95491abd6a..9ae1b6a8e30f 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -1,3 +1,6 @@
1
2menu "Memory Management options"
3
1config SELECT_MEMORY_MODEL 4config SELECT_MEMORY_MODEL
2 def_bool y 5 def_bool y
3 depends on ARCH_SELECT_MEMORY_MODEL 6 depends on ARCH_SELECT_MEMORY_MODEL
@@ -762,3 +765,5 @@ config GUP_BENCHMARK
762 765
763config ARCH_HAS_PTE_SPECIAL 766config ARCH_HAS_PTE_SPECIAL
764 bool 767 bool
768
769endmenu
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-24 06:15:21 -0400