lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] i386: clean up cpu_init()

Browse Source 
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: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Rusty Russell
2007-05-02 19:27:10 +02:00
committed by Andi Kleen
parent bf50467204
commit d2cbcc49e2
3 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
arch/i386/kernel/cpu/common.c
View File

@@ -644,9 +644,16 @@ struct i386_pda boot_pda = {
.pcurrent = &init_task, .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 tss_struct * t = &per_cpu(init_tss, cpu);
struct thread_struct *thread = &curr->thread; 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(); 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 #ifdef CONFIG_HOTPLUG_CPU
void __cpuinit cpu_uninit(void) void __cpuinit cpu_uninit(void)
{ {

8
arch/i386/kernel/smpboot.c
View File

@@ -378,14 +378,14 @@ set_cpu_sibling_map(int cpu)
static void __cpuinit start_secondary(void *unused) static void __cpuinit start_secondary(void *unused)
{ {
/* /*
* Don't put *anything* before secondary_cpu_init(), SMP * Don't put *anything* before cpu_init(), SMP booting is too
* booting is too fragile that we want to limit the * fragile that we want to limit the things done here to the
* things done here to the most necessary things. * most necessary things.
*/ */
#ifdef CONFIG_VMI #ifdef CONFIG_VMI
vmi_bringup(); vmi_bringup();
#endif #endif
secondary_cpu_init(); cpu_init();
preempt_disable(); preempt_disable();
smp_callin(); smp_callin();
while (!cpu_isset(smp_processor_id(), smp_commenced_mask)) while (!cpu_isset(smp_processor_id(), smp_commenced_mask))

2
include/asm-i386/processor.h
View File

@@ -744,6 +744,6 @@ extern void enable_sep_cpu(void);
extern int sysenter_setup(void); extern int sysenter_setup(void);
extern void cpu_set_gdt(int); extern void cpu_set_gdt(int);
extern void secondary_cpu_init(void); extern void cpu_init(void);
#endif /* __ASM_I386_PROCESSOR_H */ #endif /* __ASM_I386_PROCESSOR_H */