diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 06:43:05 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 06:43:05 -0500 |
| commit | 81444a799550214f549caf579cf65a0ca55e70b7 (patch) | |
| tree | 3288dac0740be2e1e7d1af4ee51d792a6e91edf3 /arch/x86/Kconfig.cpu | |
| parent | a64d31baed104be25305e9c71585d3ea4ee9a418 (diff) | |
| parent | da485e0cb16726797e99a595a399b9fc721b91bc (diff) | |
Merge branch 'tracing/fastboot' into cpus4096
Diffstat (limited to 'arch/x86/Kconfig.cpu')
| -rw-r--r-- | arch/x86/Kconfig.cpu | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index b815664fe370..85a78575956c 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu | |||
| @@ -515,6 +515,7 @@ config CPU_SUP_UMC_32 | |||
| 515 | config X86_DS | 515 | config X86_DS |
| 516 | def_bool X86_PTRACE_BTS | 516 | def_bool X86_PTRACE_BTS |
| 517 | depends on X86_DEBUGCTLMSR | 517 | depends on X86_DEBUGCTLMSR |
| 518 | select HAVE_HW_BRANCH_TRACER | ||
| 518 | 519 | ||
| 519 | config X86_PTRACE_BTS | 520 | config X86_PTRACE_BTS |
| 520 | bool "Branch Trace Store" | 521 | bool "Branch Trace Store" |