diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 20:34:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 20:34:00 -0400 |
| commit | e89f38218ff6de09983bd8769ec0cdf6e70d9e8e (patch) | |
| tree | 92bcfb6f347be2132ae446ae3403eed62278b053 /arch | |
| parent | 7b35fa86e47f83db27056b202463d926ff0a2c8f (diff) | |
| parent | fc532f810832beb3306b42526a78f411972281c7 (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
Diffstat (limited to 'arch')
| -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 |