Commit fcbc04c0 authored by Ingo Molnar's avatar Ingo Molnar

x86: voyager fix

Reported-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 4d33bdb7
...@@ -23,7 +23,7 @@ config X86 ...@@ -23,7 +23,7 @@ config X86
select HAVE_KPROBES select HAVE_KPROBES
select HAVE_KRETPROBES select HAVE_KRETPROBES
select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
select HAVE_ARCH_KGDB select HAVE_ARCH_KGDB if !X86_VOYAGER
config GENERIC_LOCKBREAK config GENERIC_LOCKBREAK
......
...@@ -206,11 +206,6 @@ static struct irq_chip vic_chip = { ...@@ -206,11 +206,6 @@ static struct irq_chip vic_chip = {
/* used to count up as CPUs are brought on line (starts at 0) */ /* used to count up as CPUs are brought on line (starts at 0) */
static int cpucount = 0; 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 */
unsigned char *trampoline_base;
/* The per cpu profile stuff - used in smp_local_timer_interrupt */ /* The per cpu profile stuff - used in smp_local_timer_interrupt */
static DEFINE_PER_CPU(int, prof_multiplier) = 1; static DEFINE_PER_CPU(int, prof_multiplier) = 1;
static DEFINE_PER_CPU(int, prof_old_multiplier) = 1; static DEFINE_PER_CPU(int, prof_old_multiplier) = 1;
...@@ -427,18 +422,6 @@ void __init smp_store_cpu_info(int id) ...@@ -427,18 +422,6 @@ void __init smp_store_cpu_info(int id)
identify_secondary_cpu(c); identify_secondary_cpu(c);
} }
/* set up the trampoline and return the physical address of the code */
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(trampoline_base, trampoline_data,
trampoline_end - trampoline_data);
return virt_to_phys(trampoline_base);
}
/* Routine initially called when a non-boot CPU is brought online */ /* Routine initially called when a non-boot CPU is brought online */
static void __init start_secondary(void *unused) static void __init start_secondary(void *unused)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment