summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorNathan Lynch <ntl@pobox.com>2008-07-25 17:50:30 -0500
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-07-26 09:02:43 +1000
commitfc532f810832beb3306b42526a78f411972281c7 (patch)
treeef4df27e7e633660498a29583986309aebd494f5 /arch
parent5047887caf1806f31652210df27fb62a7c43f27d (diff)
downloadop-kernel-dev-fc532f810832beb3306b42526a78f411972281c7.zip
op-kernel-dev-fc532f810832beb3306b42526a78f411972281c7.tar.gz
powerpc: Fix boot problem due to AT_BASE_PLATFORM change
Commit 9115d13453dee22473a1e8cacc90a8d64a9c4bc9 ("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: Nathan Lynch <ntl@pobox.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/cputable.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 25a052c..25c273c 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -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
OpenPOWER on IntegriCloud