diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-04-21 07:39:53 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-24 17:15:43 -0400 |
commit | fcbc04c0ab345f6e9cabc92a15f35031a10fde9f (patch) | |
tree | 14958663d99a73b3ecf8285cc0e600b967bbce54 /arch/x86/mach-voyager | |
parent | 4d33bdb7688de7a61859dafc783eb9b6bca279fc (diff) |
x86: voyager fix
Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mach-voyager')
-rw-r--r-- | arch/x86/mach-voyager/voyager_smp.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c index 96f60c7cd124..d05722121d24 100644 --- a/arch/x86/mach-voyager/voyager_smp.c +++ b/arch/x86/mach-voyager/voyager_smp.c | |||
@@ -206,11 +206,6 @@ static struct irq_chip vic_chip = { | |||
206 | /* used to count up as CPUs are brought on line (starts at 0) */ | 206 | /* used to count up as CPUs are brought on line (starts at 0) */ |
207 | static int cpucount = 0; | 207 | static int cpucount = 0; |
208 | 208 | ||
209 | /* steal a page from the bottom of memory for the trampoline and | ||
210 | * squirrel its address away here. This will be in kernel virtual | ||
211 | * space */ | ||
212 | unsigned char *trampoline_base; | ||
213 | |||
214 | /* The per cpu profile stuff - used in smp_local_timer_interrupt */ | 209 | /* The per cpu profile stuff - used in smp_local_timer_interrupt */ |
215 | static DEFINE_PER_CPU(int, prof_multiplier) = 1; | 210 | static DEFINE_PER_CPU(int, prof_multiplier) = 1; |
216 | static DEFINE_PER_CPU(int, prof_old_multiplier) = 1; | 211 | static DEFINE_PER_CPU(int, prof_old_multiplier) = 1; |
@@ -427,18 +422,6 @@ void __init smp_store_cpu_info(int id) | |||
427 | identify_secondary_cpu(c); | 422 | identify_secondary_cpu(c); |
428 | } | 423 | } |
429 | 424 | ||
430 | /* set up the trampoline and return the physical address of the code */ | ||
431 | unsigned long __init setup_trampoline(void) | ||
432 | { | ||
433 | /* these two are global symbols in trampoline.S */ | ||
434 | extern const __u8 trampoline_end[]; | ||
435 | extern const __u8 trampoline_data[]; | ||
436 | |||
437 | memcpy(trampoline_base, trampoline_data, | ||
438 | trampoline_end - trampoline_data); | ||
439 | return virt_to_phys(trampoline_base); | ||
440 | } | ||
441 | |||
442 | /* Routine initially called when a non-boot CPU is brought online */ | 425 | /* Routine initially called when a non-boot CPU is brought online */ |
443 | static void __init start_secondary(void *unused) | 426 | static void __init start_secondary(void *unused) |
444 | { | 427 | { |