Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 113262
b: refs/heads/master
c: 26fd105
h: refs/heads/master
v: v3
  • Loading branch information
Alex Nixon authored and Ingo Molnar committed Sep 8, 2008
1 parent e53148c commit 4839244
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 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: 2737146b3aa2cf8b5d5ae87a18c49fe1c374528b
refs/heads/master: 26fd10517e810dd59ea050b052de24a75ee6dc07
12 changes: 6 additions & 6 deletions trunk/arch/x86/xen/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ static void xen_smp_cpus_done(unsigned int max_cpus)
}

#ifdef CONFIG_HOTPLUG_CPU
int xen_cpu_disable(void)
static int xen_cpu_disable(void)
{
unsigned int cpu = smp_processor_id();
if (cpu == 0)
Expand All @@ -345,7 +345,7 @@ int xen_cpu_disable(void)
return 0;
}

void xen_cpu_die(unsigned int cpu)
static void xen_cpu_die(unsigned int cpu)
{
while (HYPERVISOR_vcpu_op(VCPUOP_is_up, cpu, NULL)) {
current->state = TASK_UNINTERRUPTIBLE;
Expand All @@ -362,25 +362,25 @@ void xen_cpu_die(unsigned int cpu)
alternatives_smp_switch(0);
}

void xen_play_dead(void)
static void xen_play_dead(void)
{
play_dead_common();
HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL);
cpu_bringup();
}

#else /* !CONFIG_HOTPLUG_CPU */
int xen_cpu_disable(void)
static int xen_cpu_disable(void)
{
return -ENOSYS;
}

void xen_cpu_die(unsigned int cpu)
static void xen_cpu_die(unsigned int cpu)
{
BUG();
}

void xen_play_dead(void)
static void xen_play_dead(void)
{
BUG();
}
Expand Down
4 changes: 0 additions & 4 deletions trunk/arch/x86/xen/xen-ops.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ void xen_mark_init_mm_pinned(void);

void __init xen_setup_vcpu_info_placement(void);

void xen_play_dead(void);
void xen_cpu_die(unsigned int cpu);
int xen_cpu_disable(void);

#ifdef CONFIG_SMP
void xen_smp_init(void);

Expand Down

0 comments on commit 4839244

Please sign in to comment.