Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0c1b2724069951b1902373e688042b2ec382f68f

Authored by OGAWA Hirofumi
Committed by Ingo Molnar
1 parent c86c7fbc82

x86: disable hpet legacy replacement for kdump 

we should also add hpet_disable() for kdump.

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Showing 1 changed file with 4 additions and 0 deletions Side-by-side Diff

arch/x86/kernel/crash.c
Diff comments   View file @ 0c1b272
... ... @@ -22,6 +22,7 @@
22 22 #include <asm/nmi.h>
23 23 #include <asm/hw_irq.h>
24 24 #include <asm/apic.h>
  25 +#include <asm/hpet.h>
25 26 #include <linux/kdebug.h>
26 27 #include <asm/smp.h>
27 28  
... ... @@ -139,6 +140,9 @@
139 140 lapic_shutdown();
140 141 #if defined(CONFIG_X86_IO_APIC)
141 142 disable_IO_APIC();
  143 +#endif
  144 +#ifdef CONFIG_HPET_TIMER
  145 + hpet_disable();
142 146 #endif
143 147 crash_save_cpu(regs, safe_smp_processor_id());
144 148 }