commit 1806f826554efd206cebacc7f9f213c8e6493a5d
author Linus Torvalds <torvalds@linux-foundation.org> Wed Dec 24 10:24:14 2008 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Dec 24 10:24:14 2008 -0800
tree 01544559b4aa44a1d85fabf5d20527c08f6f5cc9
parent 2523659ded0cb261a3e1fda82fe7e4ddb6e86b6f
parent 40f15ad8aadff5ebb621b17a6f303ad2cd3f847d

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

arch/x86/Kconfig.cpu

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index b815664..8e99073 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -520,6 +520,7 @@
 	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.