Merge branch 'master' into gfs2

[powerpc.git] / arch / x86_64 / kernel / crash.c

diff --git a/arch/x86_64/kernel/crash.c b/arch/x86_64/kernel/crash.c
index fc57a13..3525f88 100644 (file)
--- a/arch/x86_64/kernel/crash.c
+++ b/arch/x86_64/kernel/crash.c
@@ -69,7 +69,7 @@ static void crash_save_this_cpu(struct pt_regs *regs, int cpu)
         * for the data I pass, and I need tags
         * on the data to indicate what information I have
         * squirrelled away.  ELF notes happen to provide
-        * all of that that no need to invent something new.
+        * all of that, no need to invent something new.
         */
 
        buf = (u32*)per_cpu_ptr(crash_notes, cpu);
@@ -194,9 +194,7 @@ void machine_crash_shutdown(struct pt_regs *regs)
        if(cpu_has_apic)
                 disable_local_APIC();
 
-#if defined(CONFIG_X86_IO_APIC)
        disable_IO_APIC();
-#endif
 
        crash_save_self(regs);
 }