Commit 1806f826 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

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
parents 2523659d 40f15ad8

arch/x86/Kconfig.cpu

+1 −0
Original line number Diff line number Diff line
@@ -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.