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

x86: unify prepare_boot_cpu

Browse Source 
definition is moved to common header. x86_64 version is now called
native_prepare_boot_cpu

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Glauber Costa
2008-03-03 14:12:37 -03:00
committed by Ingo Molnar
parent 71d195492a
commit 1e3fac83da
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/kernel/smp_64.c
View File

@@ -530,6 +530,7 @@ asmlinkage void smp_call_function_interrupt(void)
} }
struct smp_ops smp_ops = { struct smp_ops smp_ops = {
.smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
.smp_send_reschedule = native_smp_send_reschedule, .smp_send_reschedule = native_smp_send_reschedule,
.smp_call_function_mask = native_smp_call_function_mask, .smp_call_function_mask = native_smp_call_function_mask,
.cpu_up = native_cpu_up, .cpu_up = native_cpu_up,

2
arch/x86/kernel/smpboot_64.c
View File

@@ -918,7 +918,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
/* /*
* Early setup to make printk work. * Early setup to make printk work.
*/ */
void __init smp_prepare_boot_cpu(void) void __init native_smp_prepare_boot_cpu(void)
{ {
int me = smp_processor_id(); int me = smp_processor_id();
/* already set me in cpu_online_map in boot_cpu_init() */ /* already set me in cpu_online_map in boot_cpu_init() */

6
include/asm-x86/smp.h
View File

@@ -24,6 +24,11 @@ struct smp_ops {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
extern struct smp_ops smp_ops; extern struct smp_ops smp_ops;
static inline void smp_prepare_boot_cpu(void)
{
smp_ops.smp_prepare_boot_cpu();
}
static inline int __cpu_up(unsigned int cpu) static inline int __cpu_up(unsigned int cpu)
{ {
return smp_ops.cpu_up(cpu); return smp_ops.cpu_up(cpu);
@@ -41,6 +46,7 @@ static inline int smp_call_function_mask(cpumask_t mask,
return smp_ops.smp_call_function_mask(mask, func, info, wait); return smp_ops.smp_call_function_mask(mask, func, info, wait);
} }
void native_smp_prepare_boot_cpu(void);
int native_cpu_up(unsigned int cpunum); int native_cpu_up(unsigned int cpunum);
#endif #endif

5
include/asm-x86/smp_32.h
View File

@@ -39,10 +39,6 @@ extern void remove_siblinginfo(int cpu);
extern void set_cpu_sibling_map(int cpu); extern void set_cpu_sibling_map(int cpu);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
static inline void smp_prepare_boot_cpu(void)
{
smp_ops.smp_prepare_boot_cpu();
}
static inline void smp_prepare_cpus(unsigned int max_cpus) static inline void smp_prepare_cpus(unsigned int max_cpus)
{ {
smp_ops.smp_prepare_cpus(max_cpus); smp_ops.smp_prepare_cpus(max_cpus);
@@ -57,7 +53,6 @@ static inline void smp_send_stop(void)
smp_ops.smp_send_stop(); smp_ops.smp_send_stop();
} }
void native_smp_prepare_boot_cpu(void);
void native_smp_prepare_cpus(unsigned int max_cpus); void native_smp_prepare_cpus(unsigned int max_cpus);
void native_smp_cpus_done(unsigned int max_cpus); void native_smp_cpus_done(unsigned int max_cpus);