aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-03-03 14:13:11 -0300
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:40:57 +0200
commitda522b07293756b9cb4e2c570454f95b8e79e189 (patch)
tree7edfa113ca9430d62999184132b0c9a30c5d19b2
parentd507897b2f179a9b30ce2f91b768ed2ee84575bc (diff)
x86: adapt voyager's setup_trampoline
make setup_trampoline non-static. This way, it won't conflict with the extern declaration in smp.h Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/mach-voyager/voyager_smp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c
index 20b7ce697ee..11b806c7ed9 100644
--- a/arch/x86/mach-voyager/voyager_smp.c
+++ b/arch/x86/mach-voyager/voyager_smp.c
@@ -429,7 +429,7 @@ void __init smp_store_cpu_info(int id)
}
/* set up the trampoline and return the physical address of the code */
-static __u32 __init setup_trampoline(void)
+unsigned long __init setup_trampoline(void)
{
/* these two are global symbols in trampoline.S */
extern const __u8 trampoline_end[];