diff options
Diffstat (limited to 'arch/x86/Kconfig.x86_64')
| -rw-r--r-- | arch/x86/Kconfig.x86_64 | 83 |
1 files changed, 1 insertions, 82 deletions
diff --git a/arch/x86/Kconfig.x86_64 b/arch/x86/Kconfig.x86_64 index 264623c30d55..cdd1458202f1 100644 --- a/arch/x86/Kconfig.x86_64 +++ b/arch/x86/Kconfig.x86_64 | |||
| @@ -78,25 +78,10 @@ config ISA | |||
| 78 | config SBUS | 78 | config SBUS |
| 79 | bool | 79 | bool |
| 80 | 80 | ||
| 81 | config RWSEM_GENERIC_SPINLOCK | ||
| 82 | bool | ||
| 83 | default y | ||
| 84 | |||
| 85 | config RWSEM_XCHGADD_ALGORITHM | ||
| 86 | bool | ||
| 87 | |||
| 88 | config GENERIC_HWEIGHT | 81 | config GENERIC_HWEIGHT |
| 89 | bool | 82 | bool |
| 90 | default y | 83 | default y |
| 91 | 84 | ||
| 92 | config GENERIC_CALIBRATE_DELAY | ||
| 93 | bool | ||
| 94 | default y | ||
| 95 | |||
| 96 | config X86_CMPXCHG | ||
| 97 | bool | ||
| 98 | default y | ||
| 99 | |||
| 100 | config GENERIC_ISA_DMA | 85 | config GENERIC_ISA_DMA |
| 101 | bool | 86 | bool |
| 102 | default y | 87 | default y |
| @@ -125,13 +110,6 @@ config GENERIC_BUG | |||
| 125 | default y | 110 | default y |
| 126 | depends on BUG | 111 | depends on BUG |
| 127 | 112 | ||
| 128 | config ARCH_HAS_ILOG2_U32 | ||
| 129 | bool | ||
| 130 | default n | ||
| 131 | |||
| 132 | config ARCH_HAS_ILOG2_U64 | ||
| 133 | bool | ||
| 134 | default n | ||
| 135 | 113 | ||
| 136 | source "init/Kconfig" | 114 | source "init/Kconfig" |
| 137 | 115 | ||
| @@ -159,66 +137,7 @@ config X86_VSMP | |||
| 159 | 137 | ||
| 160 | endchoice | 138 | endchoice |
| 161 | 139 | ||
| 162 | choice | 140 | source "arch/x86/Kconfig.cpu" |
| 163 | prompt "Processor family" | ||
| 164 | default GENERIC_CPU | ||
| 165 | |||
| 166 | config MK8 | ||
| 167 | bool "AMD-Opteron/Athlon64" | ||
| 168 | help | ||
| 169 | Optimize for AMD Opteron/Athlon64/Hammer/K8 CPUs. | ||
| 170 | |||
| 171 | config MPSC | ||
| 172 | bool "Intel P4 / older Netburst based Xeon" | ||
| 173 | help | ||
| 174 | Optimize for Intel Pentium 4, Pentium D and older Nocona/Dempsey | ||
| 175 | Xeon CPUs with Intel 64bit which is compatible with x86-64. | ||
| 176 | Note that the latest Xeons (Xeon 51xx and 53xx) are not based on the | ||
| 177 | Netburst core and shouldn't use this option. You can distinguish them | ||
| 178 | using the cpu family field | ||
| 179 | in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one. | ||
| 180 | |||
| 181 | config MCORE2 | ||
| 182 | bool "Intel Core2 / newer Xeon" | ||
| 183 | help | ||
| 184 | Optimize for Intel Core2 and newer Xeons (51xx) | ||
| 185 | You can distinguish the newer Xeons from the older ones using | ||
| 186 | the cpu family field in /proc/cpuinfo. 15 is an older Xeon | ||
| 187 | (use CONFIG_MPSC then), 6 is a newer one. | ||
| 188 | |||
| 189 | config GENERIC_CPU | ||
| 190 | bool "Generic-x86-64" | ||
| 191 | help | ||
| 192 | Generic x86-64 CPU. | ||
| 193 | Run equally well on all x86-64 CPUs. | ||
| 194 | |||
| 195 | endchoice | ||
| 196 | |||
| 197 | # | ||
| 198 | # Define implied options from the CPU selection here | ||
| 199 | # | ||
| 200 | config X86_L1_CACHE_BYTES | ||
| 201 | int | ||
| 202 | default "128" if GENERIC_CPU || MPSC | ||
| 203 | default "64" if MK8 || MCORE2 | ||
| 204 | |||
| 205 | config X86_L1_CACHE_SHIFT | ||
| 206 | int | ||
| 207 | default "7" if GENERIC_CPU || MPSC | ||
| 208 | default "6" if MK8 || MCORE2 | ||
| 209 | |||
| 210 | config X86_INTERNODE_CACHE_BYTES | ||
| 211 | int | ||
| 212 | default "4096" if X86_VSMP | ||
| 213 | default X86_L1_CACHE_BYTES if !X86_VSMP | ||
| 214 | |||
| 215 | config X86_TSC | ||
| 216 | bool | ||
| 217 | default y | ||
| 218 | |||
| 219 | config X86_GOOD_APIC | ||
| 220 | bool | ||
| 221 | default y | ||
| 222 | 141 | ||
| 223 | config MICROCODE | 142 | config MICROCODE |
| 224 | tristate "/dev/cpu/microcode - Intel CPU microcode support" | 143 | tristate "/dev/cpu/microcode - Intel CPU microcode support" |