diff options
author | Milton Miller <miltonm@bga.com> | 2008-10-22 16:39:04 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-10-31 01:11:47 -0400 |
commit | 62a8bd6c9246c0e1f19dfb8fc65ad7c4f7cac8bb (patch) | |
tree | d831ee74e7246f98742c202162a96471fb116365 /arch/powerpc/platforms/pseries | |
parent | 1767c8f392857694899403a65942cc70b5b7d132 (diff) |
powerpc: Use is_kdump_kernel()
linux/crash_dump.h defines is_kdump_kernel() to be used by code that
needs to know if the previous kernel crashed instead of a (clean) boot
or reboot.
This updates the just added powerpc code to use it. This is needed
for the next commit, which will remove __kdump_flag.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/pseries')
-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 @@ | |||
32 | #include <linux/string.h> | 32 | #include <linux/string.h> |
33 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
34 | #include <linux/dma-mapping.h> | 34 | #include <linux/dma-mapping.h> |
35 | #include <linux/crash_dump.h> | ||
35 | #include <asm/io.h> | 36 | #include <asm/io.h> |
36 | #include <asm/prom.h> | 37 | #include <asm/prom.h> |
37 | #include <asm/rtas.h> | 38 | #include <asm/rtas.h> |
@@ -44,7 +45,6 @@ | |||
44 | #include <asm/tce.h> | 45 | #include <asm/tce.h> |
45 | #include <asm/ppc-pci.h> | 46 | #include <asm/ppc-pci.h> |
46 | #include <asm/udbg.h> | 47 | #include <asm/udbg.h> |
47 | #include <asm/kdump.h> | ||
48 | 48 | ||
49 | #include "plpar_wrappers.h" | 49 | #include "plpar_wrappers.h" |
50 | 50 | ||
@@ -292,7 +292,7 @@ static void iommu_table_setparms(struct pci_controller *phb, | |||
292 | 292 | ||
293 | tbl->it_base = (unsigned long)__va(*basep); | 293 | tbl->it_base = (unsigned long)__va(*basep); |
294 | 294 | ||
295 | if (!__kdump_flag) | 295 | if (!is_kdump_kernel()) |
296 | memset((void *)tbl->it_base, 0, *sizep); | 296 | memset((void *)tbl->it_base, 0, *sizep); |
297 | 297 | ||
298 | tbl->it_busno = phb->bus->number; | 298 | tbl->it_busno = phb->bus->number; |