diff --git a/[refs] b/[refs] index 25b1aab0b8f7..af61f9b091ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db8862eafe8a5d030a3b02e81b8bb47447c315e3 +refs/heads/master: 67be403d897f818b1a5ecc201967b0ee6a0332f9 diff --git a/trunk/arch/x86/Kconfig.cpu b/trunk/arch/x86/Kconfig.cpu index b54903efb39e..85a78575956c 100644 --- a/trunk/arch/x86/Kconfig.cpu +++ b/trunk/arch/x86/Kconfig.cpu @@ -521,7 +521,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.