Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc532f81 authored by Nathan Lynch's avatar Nathan Lynch Committed by Benjamin Herrenschmidt
Browse files

powerpc: Fix boot problem due to AT_BASE_PLATFORM change 



Commit 9115d134 ("powerpc: Enable
AT_BASE_PLATFORM aux vector") broke boot on 32-bit powerpc systems; we
have to use PTRRELOC to initialize powerpc_base_platform this early in
boot.

Bug reported by Jon Smirl.

Signed-off-by: default avatarNathan Lynch <ntl@pobox.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 5047887c

arch/powerpc/kernel/cputable.c

+2 −2
Original line number Diff line number Diff line
@@ -1660,8 +1660,8 @@ struct cpu_spec * __init identify_cpu(unsigned long offset, unsigned int pvr) 
			 * Set the base platform string once; assumes

			 * we're called with real pvr first.

			 */

			if (powerpc_base_platform == NULL)

				powerpc_base_platform = t->platform;

			if (*PTRRELOC(&powerpc_base_platform) == NULL)

				*PTRRELOC(&powerpc_base_platform) = t->platform;



#if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE)

			/* ppc64 and booke expect identify_cpu to also call