Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2cbcc49 authored by Rusty Russell's avatar Rusty Russell Committed by Andi Kleen
Browse files

[PATCH] i386: clean up cpu_init() 



We now have cpu_init() and secondary_cpu_init() doing nothing but calling
_cpu_init() with the same arguments.  Rename _cpu_init() to cpu_init() and use
it as a replcement for secondary_cpu_init().

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent bf504672

arch/i386/kernel/cpu/common.c

+9 −25
Original line number Diff line number Diff line
@@ -644,9 +644,16 @@ struct i386_pda boot_pda = { 
	.pcurrent = &init_task,

};



/* Common CPU init for both boot and secondary CPUs */

static void __cpuinit _cpu_init(int cpu, struct task_struct *curr)

/*

 * cpu_init() initializes state that is per-CPU. Some data is already

 * initialized (naturally) in the bootstrap process, such as the GDT

 * and IDT. We reload them nevertheless, this function acts as a

 * 'CPU state barrier', nothing should get across.

 */

void __cpuinit cpu_init(void)

{

	int cpu = smp_processor_id();

	struct task_struct *curr = current;

	struct tss_struct * t = &per_cpu(init_tss, cpu);

	struct thread_struct *thread = &curr->thread;
@@ -706,29 +713,6 @@ static void __cpuinit _cpu_init(int cpu, struct task_struct *curr) 
	mxcsr_feature_mask_init();

}



/* Entrypoint to initialize secondary CPU */

void __cpuinit secondary_cpu_init(void)

{

	int cpu = smp_processor_id();

	struct task_struct *curr = current;



	_cpu_init(cpu, curr);

}



/*

 * cpu_init() initializes state that is per-CPU. Some data is already

 * initialized (naturally) in the bootstrap process, such as the GDT

 * and IDT. We reload them nevertheless, this function acts as a

 * 'CPU state barrier', nothing should get across.

 */

void __cpuinit cpu_init(void)

{

	int cpu = smp_processor_id();

	struct task_struct *curr = current;



	_cpu_init(cpu, curr);

}



#ifdef CONFIG_HOTPLUG_CPU

void __cpuinit cpu_uninit(void)

{

arch/i386/kernel/smpboot.c

+4 −4
Original line number Diff line number Diff line
@@ -378,14 +378,14 @@ set_cpu_sibling_map(int cpu) 
static void __cpuinit start_secondary(void *unused)

{

	/*

	 * Don't put *anything* before secondary_cpu_init(), SMP

	 * booting is too fragile that we want to limit the

	 * things done here to the most necessary things.

	 * Don't put *anything* before cpu_init(), SMP booting is too

	 * fragile that we want to limit the things done here to the

	 * most necessary things.

	 */

#ifdef CONFIG_VMI

	vmi_bringup();

#endif

	secondary_cpu_init();

	cpu_init();

	preempt_disable();

	smp_callin();

	while (!cpu_isset(smp_processor_id(), smp_commenced_mask))

include/asm-i386/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -744,6 +744,6 @@ extern void enable_sep_cpu(void); 
extern int sysenter_setup(void);



extern void cpu_set_gdt(int);

extern void secondary_cpu_init(void);

extern void cpu_init(void);



#endif /* __ASM_I386_PROCESSOR_H */