1 files changed, 27 insertions, 34 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 2096cf180648..880fcb6c86f4 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -8,6 +8,7 @@ config 64BIT
 
 config X86_32
         def_bool !64BIT
+        select CLKSRC_I8253
 
 config X86_64
         def_bool 64BIT
@@ -71,7 +72,6 @@ config X86
         select GENERIC_IRQ_SHOW
         select IRQ_FORCED_THREADING
         select USE_GENERIC_SMP_HELPERS if SMP
-        select ARCH_NO_SYSDEV_OPS
         select HAVE_BPF_JIT if (X86_64 && NET)
 
 config INSTRUCTION_DECODER
@@ -113,7 +113,14 @@ config MMU
         def_bool y
 
 config ZONE_DMA
-        def_bool y
+        bool "DMA memory allocation support" if EXPERT
+        default y
+        help
+          DMA memory allocation support allows devices with less than 32-bit
+          addressing to allocate within the first 16MB of address space.
+          Disable if no such devices will be used.
+
+          If unsure, say Y.
 
 config SBUS
         bool
@@ -366,17 +373,6 @@ config X86_UV
 # Following is an alphabetically sorted list of 32 bit extended platforms
 # Please maintain the alphabetic order if and when there are additions
 
-config X86_ELAN
-        bool "AMD Elan"
-        depends on X86_32
-        depends on X86_EXTENDED_PLATFORM
-        ---help---
-          Select this for an AMD Elan processor.
-
-          Do not use this option for K6/Athlon/Opteron processors!
-
-          If unsure, choose "PC-compatible" instead.
-
 config X86_INTEL_CE
         bool "CE4100 TV platform"
         depends on PCI
@@ -691,6 +687,7 @@ config AMD_IOMMU
         bool "AMD IOMMU support"
         select SWIOTLB
         select PCI_MSI
+        select PCI_IOV
         depends on X86_64 && PCI && ACPI
         ---help---
           With this option you can enable support for AMD IOMMU hardware in
@@ -1175,7 +1172,7 @@ comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
 config AMD_NUMA
         def_bool y
         prompt "Old style AMD Opteron NUMA detection"
-        depends on X86_64 && NUMA && PCI
+        depends on NUMA && PCI
         ---help---
           Enable AMD NUMA node topology detection.  You should say Y here if
           you have a multi processor AMD system. This uses an old method to
@@ -1202,7 +1199,7 @@ config NODES_SPAN_OTHER_NODES
 
 config NUMA_EMU
         bool "NUMA emulation"
-        depends on X86_64 && NUMA
+        depends on NUMA
         ---help---
           Enable NUMA emulation. A flat machine will be split
           into virtual nodes when booted with "numa=fake=N", where N is the
@@ -1224,6 +1221,10 @@ config HAVE_ARCH_BOOTMEM
         def_bool y
         depends on X86_32 && NUMA
 
+config HAVE_ARCH_ALLOC_REMAP
+        def_bool y
+        depends on X86_32 && NUMA
+
 config ARCH_HAVE_MEMORY_PRESENT
         def_bool y
         depends on X86_32 && DISCONTIGMEM
@@ -1232,13 +1233,9 @@ config NEED_NODE_MEMMAP_SIZE
         def_bool y
         depends on X86_32 && (DISCONTIGMEM || SPARSEMEM)
 
-config HAVE_ARCH_ALLOC_REMAP
-        def_bool y
-        depends on X86_32 && NUMA
-
 config ARCH_FLATMEM_ENABLE
         def_bool y
-        depends on X86_32 && ARCH_SELECT_MEMORY_MODEL && !NUMA
+        depends on X86_32 && !NUMA
 
 config ARCH_DISCONTIGMEM_ENABLE
         def_bool y
@@ -1248,20 +1245,16 @@ config ARCH_DISCONTIGMEM_DEFAULT
         def_bool y
         depends on NUMA && X86_32
 
-config ARCH_PROC_KCORE_TEXT
-        def_bool y
-        depends on X86_64 && PROC_KCORE
-
-config ARCH_SPARSEMEM_DEFAULT
-        def_bool y
-        depends on X86_64
-
 config ARCH_SPARSEMEM_ENABLE
         def_bool y
         depends on X86_64 || NUMA || (EXPERIMENTAL && X86_32) || X86_32_NON_STANDARD
         select SPARSEMEM_STATIC if X86_32
         select SPARSEMEM_VMEMMAP_ENABLE if X86_64
 
+config ARCH_SPARSEMEM_DEFAULT
+        def_bool y
+        depends on X86_64
+
 config ARCH_SELECT_MEMORY_MODEL
         def_bool y
         depends on ARCH_SPARSEMEM_ENABLE
@@ -1270,6 +1263,10 @@ config ARCH_MEMORY_PROBE
         def_bool X86_64
         depends on MEMORY_HOTPLUG
 
+config ARCH_PROC_KCORE_TEXT
+        def_bool y
+        depends on X86_64 && PROC_KCORE
+
 config ILLEGAL_POINTER_VALUE
        hex
        default 0 if X86_32
@@ -1704,10 +1701,6 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE
         def_bool y
         depends on MEMORY_HOTPLUG
 
-config HAVE_ARCH_EARLY_PFN_TO_NID
-        def_bool X86_64
-        depends on NUMA
-
 config USE_PERCPU_NUMA_NODE_ID
         def_bool y
         depends on NUMA
@@ -1849,7 +1842,7 @@ config APM_ALLOW_INTS
 
 endif # APM
 
-source "arch/x86/kernel/cpu/cpufreq/Kconfig"
+source "drivers/cpufreq/Kconfig"
 
 source "drivers/cpuidle/Kconfig"
 
@@ -2077,7 +2070,7 @@ config OLPC
         depends on !X86_PAE
         select GPIOLIB
         select OF
-        select OF_PROMTREE if PROC_DEVICETREE
+        select OF_PROMTREE
         ---help---
           Add support for detecting the unique features of the OLPC
           XO hardware.