diff --git a/[refs] b/[refs] index ed670fb6b5bd..e349d9d92421 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6cececfcece2b072d29886ed7140495f3af17153 +refs/heads/master: d45b41ae8da0f54aec0eebcc6f893ba5f22a1e8e diff --git a/trunk/arch/x86/Kconfig.cpu b/trunk/arch/x86/Kconfig.cpu index 924e156a85ab..8130334329c0 100644 --- a/trunk/arch/x86/Kconfig.cpu +++ b/trunk/arch/x86/Kconfig.cpu @@ -506,6 +506,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.