diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-24 13:24:14 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-24 13:24:14 -0500 |
| commit | 1806f826554efd206cebacc7f9f213c8e6493a5d (patch) | |
| tree | 01544559b4aa44a1d85fabf5d20527c08f6f5cc9 /arch | |
| parent | 2523659ded0cb261a3e1fda82fe7e4ddb6e86b6f (diff) | |
| parent | 40f15ad8aadff5ebb621b17a6f303ad2cd3f847d (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: disable X86_PTRACE_BTS
Diffstat (limited to 'arch')
| -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..8e99073b9e0f 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu | |||
| @@ -520,6 +520,7 @@ config X86_PTRACE_BTS | |||
| 520 | bool "Branch Trace Store" | 520 | bool "Branch Trace Store" |
| 521 | default y | 521 | default y |
| 522 | depends on X86_DEBUGCTLMSR | 522 | depends on X86_DEBUGCTLMSR |
| 523 | depends on BROKEN | ||
| 523 | help | 524 | help |
| 524 | This adds a ptrace interface to the hardware's branch trace store. | 525 | This adds a ptrace interface to the hardware's branch trace store. |
| 525 | 526 | ||