Merge branch 'linus' into tracing/hw-breakpoints
[linux-2.6.git] / arch / x86 / kernel / smpboot.c
index 2fecda6..dee0f3d 100644 (file)
@@ -63,6 +63,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>
@@ -326,6 +327,7 @@ notrace static void __cpuinit start_secondary(void *unused)
        setup_secondary_clock();
 
        wmb();
+       load_debug_registers();
        cpu_idle();
 }
 
@@ -1254,6 +1256,7 @@ void cpu_disable_common(void)
        remove_cpu_from_maps(cpu);
        unlock_vector_lock();
        fixup_irqs();
+       hw_breakpoint_disable();
 }
 
 int native_cpu_disable(void)