1 files changed, 32 insertions, 11 deletions

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 010d2265f1cf..bfbb9bcae123 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -122,7 +122,7 @@ endchoice
 
 choice
         prompt "Processor family"
-        default MK8
+        default GENERIC_CPU
 
 config MK8
         bool "AMD-Opteron/Athlon64"
@@ -130,16 +130,31 @@ config MK8
           Optimize for AMD Opteron/Athlon64/Hammer/K8 CPUs.
 
 config MPSC
-       bool "Intel EM64T"
+       bool "Intel P4 / older Netburst based Xeon"
        help
-          Optimize for Intel Pentium 4 and Xeon CPUs with Intel
-          Extended Memory 64 Technology(EM64T). For details see
+          Optimize for Intel Pentium 4 and older Nocona/Dempsey Xeon CPUs
+          with Intel Extended Memory 64 Technology(EM64T). For details see
           <http://www.intel.com/technology/64bitextensions/>.
+          Note the the latest Xeons (Xeon 51xx and 53xx) are not based on the
+          Netburst core and shouldn't use this option. You can distingush them
+          using the cpu family field
+          in /proc/cpuinfo. Family 15 is a older Xeon, Family 6 a newer one
+          (this rule only applies to system that support EM64T)
+
+config MCORE2
+        bool "Intel Core2 / newer Xeon"
+        help
+          Optimize for Intel Core2 and newer Xeons (51xx)
+          You can distingush the newer Xeons from the older ones using
+          the cpu family field in /proc/cpuinfo. 15 is a older Xeon
+          (use CONFIG_MPSC then), 6 is a newer one. This rule only
+          applies to CPUs that support EM64T.
 
 config GENERIC_CPU
         bool "Generic-x86-64"
         help
           Generic x86-64 CPU.
+          Run equally well on all x86-64 CPUs.
 
 endchoice
 
@@ -149,12 +164,12 @@ endchoice
 config X86_L1_CACHE_BYTES
         int
         default "128" if GENERIC_CPU || MPSC
-        default "64" if MK8
+        default "64" if MK8 || MCORE2
 
 config X86_L1_CACHE_SHIFT
         int
         default "7" if GENERIC_CPU || MPSC
-        default "6" if MK8
+        default "6" if MK8 || MCORE2
 
 config X86_INTERNODE_CACHE_BYTES
         int
@@ -344,11 +359,6 @@ config ARCH_DISCONTIGMEM_ENABLE
        depends on NUMA
        default y
 
-
-config ARCH_DISCONTIGMEM_ENABLE
-        def_bool y
-        depends on NUMA
-
 config ARCH_DISCONTIGMEM_DEFAULT
         def_bool y
         depends on NUMA
@@ -455,6 +465,17 @@ config CALGARY_IOMMU
           Normally the kernel will make the right choice by itself.
           If unsure, say Y.
 
+config CALGARY_IOMMU_ENABLED_BY_DEFAULT
+        bool "Should Calgary be enabled by default?"
+        default y
+        depends on CALGARY_IOMMU
+        help
+          Should Calgary be enabled by default? if you choose 'y', Calgary
+          will be used (if it exists). If you choose 'n', Calgary will not be
+          used even if it exists. If you choose 'n' and would like to use
+          Calgary anyway, pass 'iommu=calgary' on the kernel command line.
+          If unsure, say Y.
+
 # need this always selected by IOMMU for the VIA workaround
 config SWIOTLB
         bool