diff --git a/[refs] b/[refs] index db87e3310e03..511e7b3e6198 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d27c23df09b702868d9a3bff86ec6abd22963ac +refs/heads/master: 99e8c5a3b875a34d894a711c9a3669858d6adf45 diff --git a/trunk/arch/Kconfig b/trunk/arch/Kconfig index d82875820a15..9d055b4f0585 100644 --- a/trunk/arch/Kconfig +++ b/trunk/arch/Kconfig @@ -135,9 +135,7 @@ config HAVE_DEFAULT_NO_SPIN_MUTEXES config HAVE_HW_BREAKPOINT bool - depends on HAVE_PERF_EVENTS - select ANON_INODES - select PERF_EVENTS + depends on PERF_EVENTS config HAVE_USER_RETURN_NOTIFIER bool diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 3b2a5aca4edb..55298e891571 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -50,6 +50,8 @@ config X86 select HAVE_KERNEL_BZIP2 select HAVE_KERNEL_LZMA select HAVE_HW_BREAKPOINT + select PERF_EVENTS + select ANON_INODES select HAVE_ARCH_KMEMCHECK select HAVE_USER_RETURN_NOTIFIER