diff options
author | Nathan Lynch <ntl@pobox.com> | 2008-07-15 19:58:51 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-25 01:44:39 -0400 |
commit | 9115d13453dee22473a1e8cacc90a8d64a9c4bc9 (patch) | |
tree | dc6c7b1aad8861ae5f88aaf496fd634338686330 /arch | |
parent | 483fad1c3fa1060d7e6710e84a065ad514571739 (diff) |
powerpc: Enable AT_BASE_PLATFORM aux vector
Stash the first platform string matched by identify_cpu() in
powerpc_base_platform, and supply that to the ELF loader for the value
of AT_BASE_PLATFORM.
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.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index b936a1dd0a50..25a052c16754 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
@@ -23,6 +23,9 @@ | |||
23 | struct cpu_spec* cur_cpu_spec = NULL; | 23 | struct cpu_spec* cur_cpu_spec = NULL; |
24 | EXPORT_SYMBOL(cur_cpu_spec); | 24 | EXPORT_SYMBOL(cur_cpu_spec); |
25 | 25 | ||
26 | /* The platform string corresponding to the real PVR */ | ||
27 | const char *powerpc_base_platform; | ||
28 | |||
26 | /* NOTE: | 29 | /* NOTE: |
27 | * Unlike ppc32, ppc64 will only call this once for the boot CPU, it's | 30 | * Unlike ppc32, ppc64 will only call this once for the boot CPU, it's |
28 | * the responsibility of the appropriate CPU save/restore functions to | 31 | * the responsibility of the appropriate CPU save/restore functions to |
@@ -1652,6 +1655,14 @@ struct cpu_spec * __init identify_cpu(unsigned long offset, unsigned int pvr) | |||
1652 | } else | 1655 | } else |
1653 | *t = *s; | 1656 | *t = *s; |
1654 | *PTRRELOC(&cur_cpu_spec) = &the_cpu_spec; | 1657 | *PTRRELOC(&cur_cpu_spec) = &the_cpu_spec; |
1658 | |||
1659 | /* | ||
1660 | * Set the base platform string once; assumes | ||
1661 | * we're called with real pvr first. | ||
1662 | */ | ||
1663 | if (powerpc_base_platform == NULL) | ||
1664 | powerpc_base_platform = t->platform; | ||
1665 | |||
1655 | #if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE) | 1666 | #if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE) |
1656 | /* ppc64 and booke expect identify_cpu to also call | 1667 | /* ppc64 and booke expect identify_cpu to also call |
1657 | * setup_cpu for that processor. I will consolidate | 1668 | * setup_cpu for that processor. I will consolidate |