tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

x86/Kconfig: Clean up Kconfig defaults

The main goal here is to have the resulting .config no carry any
options that aren't enabled and can't be (i.e such where the
default is "no" and can't be changed), so that if any such
option later gets a user visible prompt, the user will actually
be prompted on a "make ...oldconfig" rather than keeping the
previously invisible option disabled.

There's a little bit of other trivial cleanup mixed in here.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/504DEE19020000780009A285@nat28.tlf.novell.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Jan Beulich and committed by
Ingo Molnar 3120e25e c206b9dc

+33 -22
+30 -20
arch/x86/Kconfig
··· 7 7 Say no to build a 32-bit kernel - formerly known as i386 8 8 9 9 config X86_32 10 - def_bool !64BIT 10 + def_bool y 11 + depends on !64BIT 11 12 select CLKSRC_I8253 12 13 13 14 config X86_64 14 - def_bool 64BIT 15 + def_bool y 16 + depends on 64BIT 15 17 select X86_DEV_DMA_OPS 16 18 17 19 ### Arch settings ··· 101 99 select GENERIC_STRNLEN_USER 102 100 103 101 config INSTRUCTION_DECODER 104 - def_bool (KPROBES || PERF_EVENTS || UPROBES) 102 + def_bool y 103 + depends on KPROBES || PERF_EVENTS || UPROBES 105 104 106 105 config OUTPUT_FORMAT 107 106 string ··· 130 127 bool 131 128 132 129 config NEED_DMA_MAP_STATE 133 - def_bool (X86_64 || INTEL_IOMMU || DMA_API_DEBUG) 130 + def_bool y 131 + depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG 134 132 135 133 config NEED_SG_DMA_LENGTH 136 134 def_bool y 137 135 138 136 config GENERIC_ISA_DMA 139 - def_bool ISA_DMA_API 137 + def_bool y 138 + depends on ISA_DMA_API 140 139 141 140 config GENERIC_BUG 142 141 def_bool y ··· 155 150 bool 156 151 157 152 config ARCH_MAY_HAVE_PC_FDC 158 - def_bool ISA_DMA_API 153 + def_bool y 154 + depends on ISA_DMA_API 159 155 160 156 config RWSEM_GENERIC_SPINLOCK 161 - def_bool !X86_XADD 157 + def_bool y 158 + depends on !X86_XADD 162 159 163 160 config RWSEM_XCHGADD_ALGORITHM 164 - def_bool X86_XADD 161 + def_bool y 162 + depends on X86_XADD 165 163 166 164 config GENERIC_CALIBRATE_DELAY 167 165 def_bool y ··· 760 752 3 GB of memory. If unsure, say Y. 761 753 762 754 config IOMMU_HELPER 763 - def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU) 755 + def_bool y 756 + depends on CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU 764 757 765 758 config MAXSMP 766 759 bool "Enable Maximum number of SMP Processors and NUMA Nodes" ··· 1168 1159 consumes more pagetable space per process. 1169 1160 1170 1161 config ARCH_PHYS_ADDR_T_64BIT 1171 - def_bool X86_64 || X86_PAE 1162 + def_bool y 1163 + depends on X86_64 || X86_PAE 1172 1164 1173 1165 config ARCH_DMA_ADDR_T_64BIT 1174 - def_bool X86_64 || HIGHMEM64G 1166 + def_bool y 1167 + depends on X86_64 || HIGHMEM64G 1175 1168 1176 1169 config DIRECT_GBPAGES 1177 1170 bool "Enable 1GB pages for kernel pagetables" if EXPERT ··· 1296 1285 depends on ARCH_SPARSEMEM_ENABLE 1297 1286 1298 1287 config ARCH_MEMORY_PROBE 1299 - def_bool X86_64 1300 - depends on MEMORY_HOTPLUG 1288 + def_bool y 1289 + depends on X86_64 && MEMORY_HOTPLUG 1301 1290 1302 1291 config ARCH_PROC_KCORE_TEXT 1303 1292 def_bool y ··· 1986 1975 1987 1976 config PCI_CNB20LE_QUIRK 1988 1977 bool "Read CNB20LE Host Bridge Windows" if EXPERT 1989 - default n 1990 1978 depends on PCI && EXPERIMENTAL 1991 1979 help 1992 1980 Read the PCI windows out of the CNB20LE host bridge. This allows ··· 2196 2186 depends on IA32_EMULATION || X86_X32 2197 2187 select ARCH_WANT_OLD_COMPAT_IPC 2198 2188 2189 + if COMPAT 2199 2190 config COMPAT_FOR_U64_ALIGNMENT 2200 - def_bool COMPAT 2201 - depends on X86_64 2191 + def_bool y 2202 2192 2203 2193 config SYSVIPC_COMPAT 2204 2194 def_bool y 2205 - depends on COMPAT && SYSVIPC 2195 + depends on SYSVIPC 2206 2196 2207 2197 config KEYS_COMPAT 2208 - bool 2209 - depends on COMPAT && KEYS 2210 - default y 2198 + def_bool y 2199 + depends on KEYS 2200 + endif 2211 2201 2212 2202 endmenu 2213 2203
+3 -2
arch/x86/Kconfig.cpu
··· 306 306 default X86_L1_CACHE_SHIFT 307 307 308 308 config X86_CMPXCHG 309 - def_bool X86_64 || (X86_32 && !M386) 309 + def_bool y 310 + depends on X86_64 || (X86_32 && !M386) 310 311 311 312 config X86_L1_CACHE_SHIFT 312 313 int ··· 318 317 319 318 config X86_XADD 320 319 def_bool y 321 - depends on X86_64 || !M386 320 + depends on !M386 322 321 323 322 config X86_PPRO_FENCE 324 323 bool "PentiumPro memory ordering errata workaround"