projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d507897
)
x86: adapt voyager's setup_trampoline
author
Glauber Costa
<gcosta@redhat.com>
Mon, 3 Mar 2008 17:13:11 +0000
(14:13 -0300)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 17 Apr 2008 15:40:57 +0000
(17:40 +0200)
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>
arch/x86/mach-voyager/voyager_smp.c
patch
|
blob
|
history
diff --git
a/arch/x86/mach-voyager/voyager_smp.c
b/arch/x86/mach-voyager/voyager_smp.c
index
20b7ce6
..
11b806c
100644
(file)
--- 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[];