1 files changed, 6 insertions, 12 deletions

diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c
index 3cc8eb2f36a9..be7235bf105d 100644
--- a/arch/x86/mach-voyager/voyager_smp.c
+++ b/arch/x86/mach-voyager/voyager_smp.c
@@ -27,6 +27,7 @@
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 #include <asm/arch_hooks.h>
+#include <asm/trampoline.h>
 
 /* TLB state -- visible externally, indexed physically */
 DEFINE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate) = { &init_mm, 0 };
@@ -210,7 +211,7 @@ static int cpucount = 0;
 /* steal a page from the bottom of memory for the trampoline and
  * squirrel its address away here.  This will be in kernel virtual
  * space */
-static __u32 trampoline_base;
+unsigned char *trampoline_base;
 
 /* The per cpu profile stuff - used in smp_local_timer_interrupt */
 static DEFINE_PER_CPU(int, prof_multiplier) = 1;
@@ -429,15 +430,15 @@ 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[];
         extern const __u8 trampoline_data[];
 
-        memcpy((__u8 *) trampoline_base, trampoline_data,
+        memcpy(trampoline_base, trampoline_data,
                trampoline_end - trampoline_data);
-        return virt_to_phys((__u8 *) trampoline_base);
+        return virt_to_phys(trampoline_base);
 }
 
 /* Routine initially called when a non-boot CPU is brought online */
@@ -520,13 +521,6 @@ static void __init do_boot_cpu(__u8 cpu)
             & ~(voyager_extended_vic_processors
                 & voyager_allowed_boot_processors);
 
-        /* This is an area in head.S which was used to set up the
-         * initial kernel stack.  We need to alter this to give the
-         * booting CPU a new stack (taken from its idle process) */
-        extern struct {
-                __u8 *sp;
-                unsigned short ss;
-        } stack_start;
         /* This is the format of the CPI IDT gate (in real mode) which
          * we're hijacking to boot the CPU */
         union IDTFormat {
@@ -1166,7 +1160,7 @@ void flush_tlb_all(void)
  * is sorted out */
 void __init smp_alloc_memory(void)
 {
-        trampoline_base = (__u32) alloc_bootmem_low_pages(PAGE_SIZE);
+        trampoline_base = alloc_bootmem_low_pages(PAGE_SIZE);
         if (__pa(trampoline_base) >= 0x93000)
                 BUG();
 }