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/cell/ras.c | |
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/cell/ras.c')
-rw-r--r-- | arch/powerpc/platforms/cell/ras.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/cell/ras.c b/arch/powerpc/platforms/cell/ras.c index 665af1c4195..fdf088f2430 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); |