diff options
| author | Chris Wright <chrisw@sous-sol.org> | 2010-04-02 18:27:54 -0700 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2010-04-07 11:51:17 +0200 |
| commit | 8f9f55e83e939724490d7cde3833c4883c6d1310 (patch) | |
| tree | cc284bcf2e0d2924bb3771eded943e889ada68f4 /arch/x86 | |
| parent | 549c90dc9a6d659e792b2a42a0930c7da015ea4a (diff) | |
| download | kernel_samsung_smdk4412-8f9f55e83e939724490d7cde3833c4883c6d1310.zip kernel_samsung_smdk4412-8f9f55e83e939724490d7cde3833c4883c6d1310.tar.gz kernel_samsung_smdk4412-8f9f55e83e939724490d7cde3833c4883c6d1310.tar.bz2 | |
Revert "x86: disable IOMMUs on kernel crash"
This effectively reverts commit 61d047be99757fd9b0af900d7abce9a13a337488.
Disabling the IOMMU can potetially allow DMA transactions to
complete without being translated. Leave it enabled, and allow
crash kernel to do the IOMMU reinitialization properly.
Cc: stable@kernel.org
Cc: Joerg Roedel <joerg.roedel@amd.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch/x86')
| -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 a4849c1..ebd4c51 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()); } |