aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorMilton Miller <miltonm@bga.com>2008-10-22 16:39:04 -0400
committerPaul Mackerras <paulus@samba.org>2008-10-31 01:11:47 -0400
commit62a8bd6c9246c0e1f19dfb8fc65ad7c4f7cac8bb (patch)
treed831ee74e7246f98742c202162a96471fb116365 /arch/powerpc
parent1767c8f392857694899403a65942cc70b5b7d132 (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')
-rw-r--r--arch/powerpc/include/asm/kdump.h2
-rw-r--r--arch/powerpc/kernel/iommu.c3
-rw-r--r--arch/powerpc/platforms/cell/ras.c6
-rw-r--r--arch/powerpc/platforms/pseries/iommu.c4
4 files changed, 7 insertions, 8 deletions
diff --git a/arch/powerpc/include/asm/kdump.h b/arch/powerpc/include/asm/kdump.h
index 821ed48c10ed..b07ebb9784d3 100644
--- a/arch/powerpc/include/asm/kdump.h
+++ b/arch/powerpc/include/asm/kdump.h
@@ -20,8 +20,6 @@
20 20
21#ifndef __ASSEMBLY__ 21#ifndef __ASSEMBLY__
22 22
23extern unsigned long __kdump_flag;
24
25#if defined(CONFIG_CRASH_DUMP) && !defined(CONFIG_RELOCATABLE) 23#if defined(CONFIG_CRASH_DUMP) && !defined(CONFIG_RELOCATABLE)
26extern void reserve_kdump_trampoline(void); 24extern void reserve_kdump_trampoline(void);
27extern void setup_kdump_trampoline(void); 25extern void setup_kdump_trampoline(void);
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index 3857d7e2af0c..45f47c97fd14 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -32,6 +32,7 @@
32#include <linux/dma-mapping.h> 32#include <linux/dma-mapping.h>
33#include <linux/bitops.h> 33#include <linux/bitops.h>
34#include <linux/iommu-helper.h> 34#include <linux/iommu-helper.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/iommu.h> 38#include <asm/iommu.h>
@@ -460,7 +461,7 @@ void iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist,
460 461
461static void iommu_table_clear(struct iommu_table *tbl) 462static void iommu_table_clear(struct iommu_table *tbl)
462{ 463{
463 if (!__kdump_flag) { 464 if (!is_kdump_kernel()) {
464 /* Clear the table in case firmware left allocations in it */ 465 /* Clear the table in case firmware left allocations in it */
465 ppc_md.tce_free(tbl, tbl->it_offset, tbl->it_size); 466 ppc_md.tce_free(tbl, tbl->it_offset, tbl->it_size);
466 return; 467 return;
diff --git a/arch/powerpc/platforms/cell/ras.c b/arch/powerpc/platforms/cell/ras.c
index 665af1c4195b..fdf088f2430e 100644
--- a/arch/powerpc/platforms/cell/ras.c
+++ b/arch/powerpc/platforms/cell/ras.c
@@ -13,15 +13,15 @@
13#include <linux/kernel.h> 13#include <linux/kernel.h>
14#include <linux/smp.h> 14#include <linux/smp.h>
15#include <linux/reboot.h> 15#include <linux/reboot.h>
16#include <linux/kexec.h>
17#include <linux/crash_dump.h>
16 18
17#include <asm/reg.h> 19#include <asm/reg.h>
18#include <asm/io.h> 20#include <asm/io.h>
19#include <asm/prom.h> 21#include <asm/prom.h>
20#include <asm/kexec.h>
21#include <asm/machdep.h> 22#include <asm/machdep.h>
22#include <asm/rtas.h> 23#include <asm/rtas.h>
23#include <asm/cell-regs.h> 24#include <asm/cell-regs.h>
24#include <asm/kdump.h>
25 25
26#include "ras.h" 26#include "ras.h"
27 27
@@ -112,7 +112,7 @@ static int __init cbe_ptcal_enable_on_node(int nid, int order)
112 int ret = -ENOMEM; 112 int ret = -ENOMEM;
113 unsigned long addr; 113 unsigned long addr;
114 114
115 if (__kdump_flag) 115 if (is_kdump_kernel())
116 rtas_call(ptcal_stop_tok, 1, 1, NULL, nid); 116 rtas_call(ptcal_stop_tok, 1, 1, NULL, nid);
117 117
118 area = kmalloc(sizeof(*area), GFP_KERNEL); 118 area = kmalloc(sizeof(*area), GFP_KERNEL);
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;