aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/Kconfig.cpu
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/Kconfig.cpu')
-rw-r--r--arch/x86/Kconfig.cpu51
1 files changed, 28 insertions, 23 deletions
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 6156ac25ff8..f8843c3ae77 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -382,14 +382,17 @@ config X86_OOSTORE
# P6_NOPs are a relatively minor optimization that require a family >=
# 6 processor, except that it is broken on certain VIA chips.
# Furthermore, AMD chips prefer a totally different sequence of NOPs
-# (which work on all CPUs). As a result, disallow these if we're
-# compiling X86_GENERIC but not X86_64 (these NOPs do work on all
-# x86-64 capable chips); the list of processors in the right-hand clause
-# are the cores that benefit from this optimization.
+# (which work on all CPUs). In addition, it looks like Virtual PC
+# does not understand them.
+#
+# As a result, disallow these if we're not compiling for X86_64 (these
+# NOPs do work on all x86-64 capable chips); the list of processors in
+# the right-hand clause are the cores that benefit from this optimization.
#
config X86_P6_NOP
def_bool y
- depends on (X86_64 || !X86_GENERIC) && (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4 || MPSC)
+ depends on X86_64
+ depends on (MCORE2 || MPENTIUM4 || MPSC)
config X86_TSC
def_bool y
@@ -423,17 +426,9 @@ menuconfig PROCESSOR_SELECT
This lets you choose what x86 vendor support code your kernel
will include.
-config CPU_SUP_INTEL_32
+config CPU_SUP_INTEL
default y
bool "Support Intel processors" if PROCESSOR_SELECT
- depends on !64BIT
- help
- This enables extended support for Intel processors
-
-config CPU_SUP_INTEL_64
- default y
- bool "Support Intel processors" if PROCESSOR_SELECT
- depends on 64BIT
help
This enables extended support for Intel processors
@@ -444,17 +439,9 @@ config CPU_SUP_CYRIX_32
help
This enables extended support for Cyrix processors
-config CPU_SUP_AMD_32
- default y
- bool "Support AMD processors" if PROCESSOR_SELECT
- depends on !64BIT
- help
- This enables extended support for AMD processors
-
-config CPU_SUP_AMD_64
+config CPU_SUP_AMD
default y
bool "Support AMD processors" if PROCESSOR_SELECT
- depends on 64BIT
help
This enables extended support for AMD processors
@@ -485,3 +472,21 @@ config CPU_SUP_UMC_32
depends on !64BIT
help
This enables extended support for UMC processors
+
+config X86_DS
+ bool "Debug Store support"
+ default y
+ help
+ Add support for Debug Store.
+ This allows the kernel to provide a memory buffer to the hardware
+ to store various profiling and tracing events.
+
+config X86_PTRACE_BTS
+ bool "ptrace interface to Branch Trace Store"
+ default y
+ depends on (X86_DS && X86_DEBUGCTLMSR)
+ help
+ Add a ptrace interface to allow collecting an execution trace
+ of the traced task.
+ This collects control flow changes in a (cyclic) buffer and allows
+ debuggers to fill in the gaps and show an execution trace of the debuggee.