summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/prom_init.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2006-06-07 04:01:32 +0200
committerPaul Mackerras <paulus@samba.org>2006-06-09 05:05:51 +0200
commit33b7497794424181dca87f18e43ecbc07f86bba5 (patch)
treebfcd314e42da1ef4098d272a7ab3f2f49da429a9 /arch/powerpc/kernel/prom_init.c
parentpowerpc: Fix machine check problem on 32-bit kernels (diff)
downloadlinux-33b7497794424181dca87f18e43ecbc07f86bba5.tar.xz
linux-33b7497794424181dca87f18e43ecbc07f86bba5.zip
[PATCH] powerpc: Fix call to ibm,client-architecture-support
The code in prom_init.c calling the firmware ibm,client-architecture-support method on pSeries has a bug where it fails to properly pass the instance handle of the firmware object when trying to call a method. Result ranges from the call doing nothing to the firmware crashing. (Found by Segher, thanks !) Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/prom_init.c')
-rw-r--r--arch/powerpc/kernel/prom_init.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 41e9ab40cd54..f393a3867430 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -822,6 +822,7 @@ static void __init prom_send_capabilities(void)
/* try calling the ibm,client-architecture-support method */
if (call_prom_ret("call-method", 3, 2, &ret,
ADDR("ibm,client-architecture-support"),
+ root,
ADDR(ibm_architecture_vec)) == 0) {
/* the call exists... */
if (ret)