Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 88707
b: refs/heads/master
c: c559764
h: refs/heads/master
i:
  88705: 416ea0a
  88703: 7e67311
v: v3
  • Loading branch information
Glauber Costa authored and Ingo Molnar committed Apr 17, 2008
1 parent 70e6270 commit 1c45286
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7557da67208f6ed3a1073594b7597bf20c9eb63a
refs/heads/master: c559764923dacef301116a248695856e6eb96e48
2 changes: 2 additions & 0 deletions trunk/arch/x86/kernel/smp_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,8 @@ asmlinkage void smp_call_function_interrupt(void)
struct smp_ops smp_ops = {
.smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
.smp_prepare_cpus = native_smp_prepare_cpus,
.smp_cpus_done = native_smp_cpus_done,

.smp_send_reschedule = native_smp_send_reschedule,
.smp_call_function_mask = native_smp_call_function_mask,
.cpu_up = native_cpu_up,
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/x86/kernel/smpboot_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,7 @@ int __cpuinit native_cpu_up(unsigned int cpu)
/*
* Finish the SMP boot.
*/
void __init smp_cpus_done(unsigned int max_cpus)
void __init native_smp_cpus_done(unsigned int max_cpus)
{
smp_cleanup_boot();
setup_ioapic_dest();
Expand Down
6 changes: 6 additions & 0 deletions trunk/include/asm-x86/smp.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ static inline void smp_prepare_cpus(unsigned int max_cpus)
smp_ops.smp_prepare_cpus(max_cpus);
}

static inline void smp_cpus_done(unsigned int max_cpus)
{
smp_ops.smp_cpus_done(max_cpus);
}

static inline int __cpu_up(unsigned int cpu)
{
return smp_ops.cpu_up(cpu);
Expand All @@ -53,6 +58,7 @@ static inline int smp_call_function_mask(cpumask_t mask,

void native_smp_prepare_boot_cpu(void);
void native_smp_prepare_cpus(unsigned int max_cpus);
void native_smp_cpus_done(unsigned int max_cpus);
int native_cpu_up(unsigned int cpunum);
#endif

Expand Down
7 changes: 0 additions & 7 deletions trunk/include/asm-x86/smp_32.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,11 @@ extern void remove_siblinginfo(int cpu);
extern void set_cpu_sibling_map(int cpu);

#ifdef CONFIG_SMP
static inline void smp_cpus_done(unsigned int max_cpus)
{
smp_ops.smp_cpus_done(max_cpus);
}

static inline void smp_send_stop(void)
{
smp_ops.smp_send_stop();
}

void native_smp_cpus_done(unsigned int max_cpus);

#ifndef CONFIG_PARAVIRT
#define startup_ipi_hook(phys_apicid, start_eip, start_esp) do { } while (0)
#endif
Expand Down

0 comments on commit 1c45286

Please sign in to comment.