Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3120e25efdc0834c88e1c0f8394e2087444f8c19

Authored by Jan Beulich
Committed by Ingo Molnar
1 parent c206b9dcb1
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 2 changed files with 33 additions and 22 deletions Side-by-side Diff

... ... @@ -7,11 +7,13 @@
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
... ... @@ -99,7 +101,8 @@
99 101 select GENERIC_STRNLEN_USER
100 102  
101 103 config INSTRUCTION_DECODER
102   - def_bool (KPROBES || PERF_EVENTS || UPROBES)
  104 + def_bool y
  105 + depends on KPROBES || PERF_EVENTS || UPROBES
103 106  
104 107 config OUTPUT_FORMAT
105 108 string
106 109  
... ... @@ -127,13 +130,15 @@
127 130 bool
128 131  
129 132 config NEED_DMA_MAP_STATE
130   - def_bool (X86_64 || INTEL_IOMMU || DMA_API_DEBUG)
  133 + def_bool y
  134 + depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG
131 135  
132 136 config NEED_SG_DMA_LENGTH
133 137 def_bool y
134 138  
135 139 config GENERIC_ISA_DMA
136   - def_bool ISA_DMA_API
  140 + def_bool y
  141 + depends on ISA_DMA_API
137 142  
138 143 config GENERIC_BUG
139 144 def_bool y
140 145  
141 146  
... ... @@ -150,13 +155,16 @@
150 155 bool
151 156  
152 157 config ARCH_MAY_HAVE_PC_FDC
153   - def_bool ISA_DMA_API
  158 + def_bool y
  159 + depends on ISA_DMA_API
154 160  
155 161 config RWSEM_GENERIC_SPINLOCK
156   - def_bool !X86_XADD
  162 + def_bool y
  163 + depends on !X86_XADD
157 164  
158 165 config RWSEM_XCHGADD_ALGORITHM
159   - def_bool X86_XADD
  166 + def_bool y
  167 + depends on X86_XADD
160 168  
161 169 config GENERIC_CALIBRATE_DELAY
162 170 def_bool y
... ... @@ -752,7 +760,8 @@
752 760 3 GB of memory. If unsure, say Y.
753 761  
754 762 config IOMMU_HELPER
755   - def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)
  763 + def_bool y
  764 + depends on CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU
756 765  
757 766 config MAXSMP
758 767 bool "Enable Maximum number of SMP Processors and NUMA Nodes"
759 768  
... ... @@ -1159,10 +1168,12 @@
1159 1168 consumes more pagetable space per process.
1160 1169  
1161 1170 config ARCH_PHYS_ADDR_T_64BIT
1162   - def_bool X86_64 || X86_PAE
  1171 + def_bool y
  1172 + depends on X86_64 || X86_PAE
1163 1173  
1164 1174 config ARCH_DMA_ADDR_T_64BIT
1165   - def_bool X86_64 || HIGHMEM64G
  1175 + def_bool y
  1176 + depends on X86_64 || HIGHMEM64G
1166 1177  
1167 1178 config DIRECT_GBPAGES
1168 1179 bool "Enable 1GB pages for kernel pagetables" if EXPERT
... ... @@ -1285,8 +1296,8 @@
1285 1296 depends on ARCH_SPARSEMEM_ENABLE
1286 1297  
1287 1298 config ARCH_MEMORY_PROBE
1288   - def_bool X86_64
1289   - depends on MEMORY_HOTPLUG
  1299 + def_bool y
  1300 + depends on X86_64 && MEMORY_HOTPLUG
1290 1301  
1291 1302 config ARCH_PROC_KCORE_TEXT
1292 1303 def_bool y
... ... @@ -1975,7 +1986,6 @@
1975 1986  
1976 1987 config PCI_CNB20LE_QUIRK
1977 1988 bool "Read CNB20LE Host Bridge Windows" if EXPERT
1978   - default n
1979 1989 depends on PCI && EXPERIMENTAL
1980 1990 help
1981 1991 Read the PCI windows out of the CNB20LE host bridge. This allows
1982 1992  
1983 1993  
1984 1994  
... ... @@ -2186,18 +2196,18 @@
2186 2196 depends on IA32_EMULATION || X86_X32
2187 2197 select ARCH_WANT_OLD_COMPAT_IPC
2188 2198  
  2199 +if COMPAT
2189 2200 config COMPAT_FOR_U64_ALIGNMENT
2190   - def_bool COMPAT
2191   - depends on X86_64
  2201 + def_bool y
2192 2202  
2193 2203 config SYSVIPC_COMPAT
2194 2204 def_bool y
2195   - depends on COMPAT && SYSVIPC
  2205 + depends on SYSVIPC
2196 2206  
2197 2207 config KEYS_COMPAT
2198   - bool
2199   - depends on COMPAT && KEYS
2200   - default y
  2208 + def_bool y
  2209 + depends on KEYS
  2210 +endif
2201 2211  
2202 2212 endmenu
2203 2213  
arch/x86/Kconfig.cpu
Diff comments   View file @ 3120e25
... ... @@ -306,7 +306,8 @@
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
... ... @@ -317,7 +318,7 @@
317 318  
318 319 config X86_XADD
319 320 def_bool y
320   - depends on X86_64 || !M386
  321 + depends on !M386
321 322  
322 323 config X86_PPRO_FENCE
323 324 bool "PentiumPro memory ordering errata workaround"