Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-24 10:24:14 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-24 10:24:14 -0800
commit1806f826554efd206cebacc7f9f213c8e6493a5d (patch)
tree01544559b4aa44a1d85fabf5d20527c08f6f5cc9
parent2523659ded0cb261a3e1fda82fe7e4ddb6e86b6f (diff)
parent40f15ad8aadff5ebb621b17a6f303ad2cd3f847d (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
-rw-r--r--arch/x86/Kconfig.cpu1
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
bool "Branch Trace Store"
default y
depends on X86_DEBUGCTLMSR
+ depends on BROKEN
help
This adds a ptrace interface to the hardware's branch trace store.