diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-01 18:02:17 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-01 18:02:17 +0100 |
| commit | 3af4182cc5be7d5505f9801ee3297373f1872446 (patch) | |
| tree | 214348d40ed547a72f9612a7e5c94a01afded812 /arch/powerpc/platforms/pseries/iommu.c | |
| parent | f5d4c67e41a262f0cdfaec1bb0fa8e5952187ef9 (diff) | |
| parent | c07f62e5f18123103459ff74e86af1518a5b8af5 (diff) | |
Merge branch 'upstream' into topic/asoc
Diffstat (limited to 'arch/powerpc/platforms/pseries/iommu.c')
| -rw-r--r-- | arch/powerpc/platforms/pseries/iommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c index d56491d182d..c90817acb47 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c @@ -32,6 +32,7 @@ #include <linux/string.h> #include <linux/pci.h> #include <linux/dma-mapping.h> +#include <linux/crash_dump.h> #include <asm/io.h> #include <asm/prom.h> #include <asm/rtas.h> @@ -44,7 +45,6 @@ #include <asm/tce.h> #include <asm/ppc-pci.h> #include <asm/udbg.h> -#include <asm/kdump.h> #include "plpar_wrappers.h" @@ -292,7 +292,7 @@ static void iommu_table_setparms(struct pci_controller *phb, tbl->it_base = (unsigned long)__va(*basep); - if (!__kdump_flag) + if (!is_kdump_kernel()) memset((void *)tbl->it_base, 0, *sizep); tbl->it_busno = phb->bus->number; |