summaryrefslogtreecommitdiffstats
path: root/arch/ppc64/kernel/prom_init.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-05-31 17:01:11 +1000
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-31 08:26:05 -0700
commit05fda3b1d88ebac1fc866fc3ed5b7ef5a4672fa6 (patch)
tree11f504429d5e6708259f376b76e96cafd3bf9215 /arch/ppc64/kernel/prom_init.c
parent5e485b7975472ba4a408523deb6541e70c451842 (diff)
downloadlinux-05fda3b1d88ebac1fc866fc3ed5b7ef5a4672fa6.tar.bz2
[PATCH] ppc64: actually call prom_send_capabilities
When I sent in the patch adding the code for the kernel to tell the firmware about its capabilities on pSeries machines, I included the function to give the capabilities to firmware but somehow forgot the hunk that adds the call to the new function. This patch adds the call. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc64/kernel/prom_init.c')
-rw-r--r--arch/ppc64/kernel/prom_init.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ppc64/kernel/prom_init.c b/arch/ppc64/kernel/prom_init.c
index 6f79b7b9b445..bc53967a8643 100644
--- a/arch/ppc64/kernel/prom_init.c
+++ b/arch/ppc64/kernel/prom_init.c
@@ -1881,6 +1881,12 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, unsigned long
&getprop_rval, sizeof(getprop_rval));
/*
+ * On pSeries, inform the firmware about our capabilities
+ */
+ if (RELOC(of_platform) & PLATFORM_PSERIES)
+ prom_send_capabilities();
+
+ /*
* On pSeries, copy the CPU hold code
*/
if (RELOC(of_platform) & PLATFORM_PSERIES)