diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2010-04-07 14:36:20 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2010-04-07 14:36:20 +0200 |
| commit | 12ff4bf58b64ad3b8fb8e27889c99dcd5aa6fb0b (patch) | |
| tree | 294170ed80ca1a3abfc8b704b74d843ba205dada /arch/x86/kernel/crash.c | |
| parent | 2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6 (diff) | |
| parent | 20a1cfba340f23a7ca62391e199c40c86b762ea3 (diff) | |
Merge branch 'amd-iommu/fixes' into iommu/fixes
Diffstat (limited to 'arch/x86/kernel/crash.c')
| -rw-r--r-- | arch/x86/kernel/crash.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index a4849c10a77e..ebd4c51d096a 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -27,7 +27,6 @@ #include <asm/cpu.h> #include <asm/reboot.h> #include <asm/virtext.h> -#include <asm/x86_init.h> #if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC) @@ -103,10 +102,5 @@ void native_machine_crash_shutdown(struct pt_regs *regs) #ifdef CONFIG_HPET_TIMER hpet_disable(); #endif - -#ifdef CONFIG_X86_64 - x86_platform.iommu_shutdown(); -#endif - crash_save_cpu(regs, safe_smp_processor_id()); } |