1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
index c1c429d00130..a3fa43ba5d3b 100644
--- a/arch/x86/kernel/machine_kexec_32.c
+++ b/arch/x86/kernel/machine_kexec_32.c
@@ -25,6 +25,7 @@
 #include <asm/desc.h>
 #include <asm/system.h>
 #include <asm/cacheflush.h>
+#include <asm/debugreg.h>
 static void set_idt(void *newidt, __u16 limit)
 {
@@ -157,8 +158,7 @@ int machine_kexec_prepare(struct kimage *image)
 {
        int error;
-        if (nx_enabled)
+        set_pages_x(image->control_code_page, 1);
-                set_pages_x(image->control_code_page, 1);
        error = machine_kexec_alloc_page_tables(image);
        if (error)
                return error;
@@ -172,8 +172,7 @@ int machine_kexec_prepare(struct kimage *image)
 */
 void machine_kexec_cleanup(struct kimage *image)
 {
-        if (nx_enabled)
+        set_pages_nx(image->control_code_page, 1);
-                set_pages_nx(image->control_code_page, 1);
        machine_kexec_free_page_tables(image);
 }
@@ -202,6 +201,7 @@ void machine_kexec(struct kimage *image)
        /* Interrupts aren't acceptable while we reboot */
        local_irq_disable();
+        hw_breakpoint_disable();
        if (image->preserve_context) {
 #ifdef CONFIG_X86_IO_APIC