diff --git a/[refs] b/[refs] index 5ea0d82dc2a3..3f1ec3fc628e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 782cc5ae6331d63b4febaa312c9d14493aafa9b8 +refs/heads/master: 7e0bfad24d85de7cf2202a7b0ce51de11a077b21 diff --git a/trunk/arch/x86/Kconfig.cpu b/trunk/arch/x86/Kconfig.cpu index 8130334329c0..924e156a85ab 100644 --- a/trunk/arch/x86/Kconfig.cpu +++ b/trunk/arch/x86/Kconfig.cpu @@ -506,7 +506,6 @@ 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.