Merge commit 'perf/core' into perf/hw-breakpoint

[cascardo/linux.git] / arch / x86 / kernel / smpboot.c

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 565ebc6..213a7a3 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -64,6 +64,7 @@
 #include <asm/apic.h>
 #include <asm/setup.h>
 #include <asm/uv/uv.h>
+#include <asm/debugreg.h>
 #include <linux/mc146818rtc.h>
 
 #include <asm/smpboot_hooks.h>
@@ -327,6 +328,7 @@ notrace static void __cpuinit start_secondary(void *unused)
        x86_cpuinit.setup_percpu_clockev();
 
        wmb();
+       load_debug_registers();
        cpu_idle();
 }
 
@@ -1267,6 +1269,7 @@ void cpu_disable_common(void)
        remove_cpu_from_maps(cpu);
        unlock_vector_lock();
        fixup_irqs();
+       hw_breakpoint_disable();
 }
 
 int native_cpu_disable(void)