summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms
diff options
context:
space:
mode:
authorTony Breeds2008-12-15 19:34:43 +0100
committerPaul Mackerras2008-12-21 04:21:15 +0100
commit532774ec7fa396da20ca724c0cf83d93ee76622f (patch)
treed8f155224fa105c0fb13a1b88ddff749fa6924b5 /arch/powerpc/platforms
parentpowerpc: Protect against NULL pointer deref in phyp-dump code (diff)
downloadkernel-qcow2-linux-532774ec7fa396da20ca724c0cf83d93ee76622f.tar.gz
kernel-qcow2-linux-532774ec7fa396da20ca724c0cf83d93ee76622f.tar.xz
kernel-qcow2-linux-532774ec7fa396da20ca724c0cf83d93ee76622f.zip
powerpc: Pass a valid token to rtas_call() in phyp-dump code
ibm_configure_kernel_dump is passed as the token to rtas_call() is never initialised. This sets it to something sane. Signed-off-by: Tony Breeds <tony@bakeyournoodle.com> Acked-by: Nathan Lynch <ntl@pobox.com> Acked-by: Manish Ahuja <mahujam@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r--arch/powerpc/platforms/pseries/phyp_dump.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/phyp_dump.c b/arch/powerpc/platforms/pseries/phyp_dump.c
index 16e659a71440..6cf35cd8d0b5 100644
--- a/arch/powerpc/platforms/pseries/phyp_dump.c
+++ b/arch/powerpc/platforms/pseries/phyp_dump.c
@@ -414,6 +414,8 @@ static int __init phyp_dump_setup(void)
of_node_put(rtas);
}
+ ibm_configure_kernel_dump = rtas_token("ibm,configure-kernel-dump");
+
print_dump_header(dump_header);
dump_area_length = init_dump_header(&phdr);
/* align down */