aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 17:34:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 17:34:00 -0700
commite89f38218ff6de09983bd8769ec0cdf6e70d9e8e (patch)
tree92bcfb6f347be2132ae446ae3403eed62278b053
parent7b35fa86e47f83db27056b202463d926ff0a2c8f (diff)
parentfc532f810832beb3306b42526a78f411972281c7 (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Fix boot problem due to AT_BASE_PLATFORM change
-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 25a052c1675..25c273c761d 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