diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 17:49:01 +0300 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 17:49:01 +0300 |
| commit | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (patch) | |
| tree | bbcafe7f23975979f7a2bc6fd1404908d5fd7bd1 /arch/powerpc/platforms/pseries/iommu.c | |
| parent | e3bd9ec5d8bfc90f9e1bd995677829e57a404061 (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
| download | linux-e856359685143a2f65876e7db4e4aa0ef5dce7f0.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-moves2
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 d56491d182d3..c90817acb472 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; |