diff options
| author | Alex Nixon <alex.nixon@citrix.com> | 2008-09-08 08:43:34 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-08 13:12:24 -0400 |
| commit | 26fd10517e810dd59ea050b052de24a75ee6dc07 (patch) | |
| tree | a9c1c4e28903946e7e1deb2febf018d8a82bb0b9 | |
| parent | 2737146b3aa2cf8b5d5ae87a18c49fe1c374528b (diff) | |
xen: make CPU hotplug functions static
There's no need for these functions to be accessed from outside of xen/smp.c
Signed-off-by: Alex Nixon <alex.nixon@citrix.com>
Acked-by: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/xen/smp.c | 12 | ||||
| -rw-r--r-- | arch/x86/xen/xen-ops.h | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index bf51a466d62c..d77da613b1d2 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c | |||
| @@ -333,7 +333,7 @@ static void xen_smp_cpus_done(unsigned int max_cpus) | |||
| 333 | } | 333 | } |
| 334 | 334 | ||
| 335 | #ifdef CONFIG_HOTPLUG_CPU | 335 | #ifdef CONFIG_HOTPLUG_CPU |
| 336 | int xen_cpu_disable(void) | 336 | static int xen_cpu_disable(void) |
| 337 | { | 337 | { |
| 338 | unsigned int cpu = smp_processor_id(); | 338 | unsigned int cpu = smp_processor_id(); |
| 339 | if (cpu == 0) | 339 | if (cpu == 0) |
| @@ -345,7 +345,7 @@ int xen_cpu_disable(void) | |||
| 345 | return 0; | 345 | return 0; |
| 346 | } | 346 | } |
| 347 | 347 | ||
| 348 | void xen_cpu_die(unsigned int cpu) | 348 | static void xen_cpu_die(unsigned int cpu) |
| 349 | { | 349 | { |
| 350 | while (HYPERVISOR_vcpu_op(VCPUOP_is_up, cpu, NULL)) { | 350 | while (HYPERVISOR_vcpu_op(VCPUOP_is_up, cpu, NULL)) { |
| 351 | current->state = TASK_UNINTERRUPTIBLE; | 351 | current->state = TASK_UNINTERRUPTIBLE; |
| @@ -362,7 +362,7 @@ void xen_cpu_die(unsigned int cpu) | |||
| 362 | alternatives_smp_switch(0); | 362 | alternatives_smp_switch(0); |
| 363 | } | 363 | } |
| 364 | 364 | ||
| 365 | void xen_play_dead(void) | 365 | static void xen_play_dead(void) |
| 366 | { | 366 | { |
| 367 | play_dead_common(); | 367 | play_dead_common(); |
| 368 | HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL); | 368 | HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL); |
| @@ -370,17 +370,17 @@ void xen_play_dead(void) | |||
| 370 | } | 370 | } |
| 371 | 371 | ||
| 372 | #else /* !CONFIG_HOTPLUG_CPU */ | 372 | #else /* !CONFIG_HOTPLUG_CPU */ |
| 373 | int xen_cpu_disable(void) | 373 | static int xen_cpu_disable(void) |
| 374 | { | 374 | { |
| 375 | return -ENOSYS; | 375 | return -ENOSYS; |
| 376 | } | 376 | } |
| 377 | 377 | ||
| 378 | void xen_cpu_die(unsigned int cpu) | 378 | static void xen_cpu_die(unsigned int cpu) |
| 379 | { | 379 | { |
| 380 | BUG(); | 380 | BUG(); |
| 381 | } | 381 | } |
| 382 | 382 | ||
| 383 | void xen_play_dead(void) | 383 | static void xen_play_dead(void) |
| 384 | { | 384 | { |
| 385 | BUG(); | 385 | BUG(); |
| 386 | } | 386 | } |
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index 8dbd97fd7f18..d7422dc2a55c 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h | |||
| @@ -51,10 +51,6 @@ void xen_mark_init_mm_pinned(void); | |||
| 51 | 51 | ||
| 52 | void __init xen_setup_vcpu_info_placement(void); | 52 | void __init xen_setup_vcpu_info_placement(void); |
| 53 | 53 | ||
| 54 | void xen_play_dead(void); | ||
| 55 | void xen_cpu_die(unsigned int cpu); | ||
| 56 | int xen_cpu_disable(void); | ||
| 57 | |||
| 58 | #ifdef CONFIG_SMP | 54 | #ifdef CONFIG_SMP |
| 59 | void xen_smp_init(void); | 55 | void xen_smp_init(void); |
| 60 | 56 | ||
