diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-05-23 19:42:19 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-05-23 19:42:19 -0400 |
| commit | ee0736627d3347be0be2769fa7b26431f9726c9d (patch) | |
| tree | 203e2204daaec4cf005463fdf2c7bf380d6eef36 /arch/x86/Kconfig.cpu | |
| parent | cf9972a921470b0a2da7906104bcd540b20e33bf (diff) | |
| parent | 0af48f42df15b97080b450d24219dd95db7b929a (diff) | |
Merge branch 'x86/urgent' into x86/setup
Resolved conflicts:
arch/x86/boot/memory.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
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 924e156a85ab..8130334329c0 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu | |||
| @@ -506,6 +506,7 @@ config X86_PTRACE_BTS | |||
| 506 | bool "Branch Trace Store" | 506 | bool "Branch Trace Store" |
| 507 | default y | 507 | default y |
| 508 | depends on X86_DEBUGCTLMSR | 508 | depends on X86_DEBUGCTLMSR |
| 509 | depends on BROKEN | ||
| 509 | ---help--- | 510 | ---help--- |
| 510 | This adds a ptrace interface to the hardware's branch trace store. | 511 | This adds a ptrace interface to the hardware's branch trace store. |
| 511 | 512 | ||