diff options
| author | Nathan Lynch <ntl@pobox.com> | 2008-07-25 18:50:30 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-25 19:02:43 -0400 |
| commit | fc532f810832beb3306b42526a78f411972281c7 (patch) | |
| tree | ef4df27e7e633660498a29583986309aebd494f5 | |
| parent | 5047887caf1806f31652210df27fb62a7c43f27d (diff) | |
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>
| -rw-r--r-- | arch/powerpc/kernel/cputable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 25a052c16754..25c273c761d1 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) | |||
| 1660 | * Set the base platform string once; assumes | 1660 | * Set the base platform string once; assumes |
| 1661 | * we're called with real pvr first. | 1661 | * we're called with real pvr first. |
| 1662 | */ | 1662 | */ |
| 1663 | if (powerpc_base_platform == NULL) | 1663 | if (*PTRRELOC(&powerpc_base_platform) == NULL) |
| 1664 | powerpc_base_platform = t->platform; | 1664 | *PTRRELOC(&powerpc_base_platform) = t->platform; |
| 1665 | 1665 | ||
| 1666 | #if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE) | 1666 | #if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE) |
| 1667 | /* ppc64 and booke expect identify_cpu to also call | 1667 | /* ppc64 and booke expect identify_cpu to also call |