Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 1806f82655 - Gogs

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

Linus Torvalds 16 years ago

parent

2523659ded 40f15ad8aa

commit

1806f82655

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
arch/x86/Kconfig.cpu
							 
								View File
							
				@@ -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.