Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3b16651f806d35b5c404f2525fbce76afa3c9297

Authored by Tejun Heo
1 parent 052936080c
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: Clean up memory model related configs in arch/x86/Kconfig 

* Remove bogus dependency on ARCH_SELECT_MEMORY_MODEL from
  ARCH_FLATMEM_ENABLE.  ENABLE configs don't interfere with
  SELECT_MEMORY_MODEL.  They just need to indicate whether the
  specific memory model is supported.

* Relocate HAVE_ARCH_ALLOC_REMAP, ARCH_PROC_KCORE_TEXT and
  ARCH_SPARSEMEM_DEFAULT so that memory model related configs are
  together in consistent order.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Christoph Lameter <cl@linux.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>

Showing 1 changed file with 13 additions and 13 deletions Side-by-side Diff

... ... @@ -1223,6 +1223,10 @@
1223 1223 def_bool y
1224 1224 depends on X86_32 && NUMA
1225 1225  
  1226 +config HAVE_ARCH_ALLOC_REMAP
  1227 + def_bool y
  1228 + depends on X86_32 && NUMA
  1229 +
1226 1230 config ARCH_HAVE_MEMORY_PRESENT
1227 1231 def_bool y
1228 1232 depends on X86_32 && DISCONTIGMEM
1229 1233  
... ... @@ -1231,13 +1235,9 @@
1231 1235 def_bool y
1232 1236 depends on X86_32 && (DISCONTIGMEM || SPARSEMEM)
1233 1237  
1234   -config HAVE_ARCH_ALLOC_REMAP
1235   - def_bool y
1236   - depends on X86_32 && NUMA
1237   -
1238 1238 config ARCH_FLATMEM_ENABLE
1239 1239 def_bool y
1240   - depends on X86_32 && ARCH_SELECT_MEMORY_MODEL && !NUMA
  1240 + depends on X86_32 && !NUMA
1241 1241  
1242 1242 config ARCH_DISCONTIGMEM_ENABLE
1243 1243 def_bool y
1244 1244  
... ... @@ -1247,20 +1247,16 @@
1247 1247 def_bool y
1248 1248 depends on NUMA && X86_32
1249 1249  
1250   -config ARCH_PROC_KCORE_TEXT
1251   - def_bool y
1252   - depends on X86_64 && PROC_KCORE
1253   -
1254   -config ARCH_SPARSEMEM_DEFAULT
1255   - def_bool y
1256   - depends on X86_64
1257   -
1258 1250 config ARCH_SPARSEMEM_ENABLE
1259 1251 def_bool y
1260 1252 depends on X86_64 || NUMA || (EXPERIMENTAL && X86_32) || X86_32_NON_STANDARD
1261 1253 select SPARSEMEM_STATIC if X86_32
1262 1254 select SPARSEMEM_VMEMMAP_ENABLE if X86_64
1263 1255  
  1256 +config ARCH_SPARSEMEM_DEFAULT
  1257 + def_bool y
  1258 + depends on X86_64
  1259 +
1264 1260 config ARCH_SELECT_MEMORY_MODEL
1265 1261 def_bool y
1266 1262 depends on ARCH_SPARSEMEM_ENABLE
... ... @@ -1268,6 +1264,10 @@
1268 1264 config ARCH_MEMORY_PROBE
1269 1265 def_bool X86_64
1270 1266 depends on MEMORY_HOTPLUG
  1267 +
  1268 +config ARCH_PROC_KCORE_TEXT
  1269 + def_bool y
  1270 + depends on X86_64 && PROC_KCORE
1271 1271  
1272 1272 config ILLEGAL_POINTER_VALUE
1273 1273 hex