Commit 89c9c4c5 authored by Brian Gerst's avatar Brian Gerst Committed by Tejun Heo
Browse files

x86: make Voyager use x86 per-cpu setup. 



Impact: standardize all x86 platforms on same setup code

With the preceding changes, Voyager can use the same per-cpu setup
code as all the other x86 platforms.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 34019be1

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ config ARCH_HAS_CACHE_LINE_SIZE 
	def_bool y



config HAVE_SETUP_PER_CPU_AREA

	def_bool X86_64_SMP || (X86_SMP && !X86_VOYAGER)

	def_bool y



config HAVE_CPUMASK_OF_CPU_MAP

	def_bool X86_64_SMP

arch/x86/kernel/setup_percpu.c

+0 −5
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ EXPORT_PER_CPU_SYMBOL(cpu_number); 
DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;

EXPORT_PER_CPU_SYMBOL(this_cpu_off);



#ifdef CONFIG_HAVE_SETUP_PER_CPU_AREA



unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {

	[0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,

};
@@ -125,6 +123,3 @@ void __init setup_per_cpu_areas(void) 
	/* Setup cpu initialized, callin, callout masks */

	setup_cpu_local_masks();

}
 


#endif

arch/x86/mach-voyager/voyager_smp.c

+0 −3
Original line number Diff line number Diff line
@@ -531,7 +531,6 @@ static void __init do_boot_cpu(__u8 cpu) 
	stack_start.sp = (void *)idle->thread.sp;



	init_gdt(cpu);

	per_cpu(this_cpu_off, cpu) = __per_cpu_offset[cpu];

	per_cpu(current_task, cpu) = idle;

	early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);

	irq_ctx_init(cpu);
@@ -1749,7 +1748,6 @@ static void __init voyager_smp_prepare_cpus(unsigned int max_cpus) 
static void __cpuinit voyager_smp_prepare_boot_cpu(void)

{

	init_gdt(smp_processor_id());

	per_cpu(this_cpu_off, cpu) = __per_cpu_offset[cpu];

	switch_to_new_gdt();



	cpu_set(smp_processor_id(), cpu_online_map);
@@ -1782,7 +1780,6 @@ static void __init voyager_smp_cpus_done(unsigned int max_cpus) 
void __init smp_setup_processor_id(void)

{

	current_thread_info()->cpu = hard_smp_processor_id();

	percpu_write(cpu_number, hard_smp_processor_id());

}



static void voyager_send_call_func(cpumask_t callmask)

CRA Git | Maintained and supported by SUSTech CRA and CCSE