summaryrefslogtreecommitdiff
path: root/arch/powerpc/boot/epapr.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-09-24 16:10:38 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-09-25 14:18:44 +1000
commit0c9fa29149d3726e14262aeb0c8461a948cc9d56 (patch)
treec154e494cf2898fa88f5160cf816f30863e9c8cc /arch/powerpc/boot/epapr.c
parentcbc9565ee82694dec31d8137dec975b83175183b (diff)
powerpc/zImage: make the "OF" wrapper support ePAPR boot
This makes the "OF" zImage wrapper (zImage.pseries, zImage.pmac, zImage.maple) work if booted via a flat device-tree (ePAPR boot mode), and thus potentially usable with kexec. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot/epapr.c')
-rw-r--r--arch/powerpc/boot/epapr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/epapr.c b/arch/powerpc/boot/epapr.c
index 06c1961bd124..02e91aa2194a 100644
--- a/arch/powerpc/boot/epapr.c
+++ b/arch/powerpc/boot/epapr.c
@@ -48,8 +48,8 @@ static void platform_fixups(void)
fdt_addr, fdt_totalsize((void *)fdt_addr), ima_size);
}
-void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
- unsigned long r6, unsigned long r7)
+void epapr_platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+ unsigned long r6, unsigned long r7)
{
epapr_magic = r6;
ima_size = r7;