diff options
| author | Vitaly Kuznetsov <vkuznets@redhat.com> | 2017-03-14 18:35:44 +0100 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2017-05-02 11:04:40 +0200 |
| commit | aa1c84e8ca7f6f881514b109b9a2468db148045c (patch) | |
| tree | 09a3c95b9a2337d477349a3a12b7d570bfa909f2 /arch | |
| parent | a2d1078a35f9a38ae888aa6147e4ca32666154a1 (diff) | |
| download | linux-aa1c84e8ca7f6f881514b109b9a2468db148045c.tar.bz2 | |
x86/xen: split xen_cpu_die()
Split xen_cpu_die() into xen_pv_cpu_die() and xen_hvm_cpu_die() to support
further splitting of smp.c.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/xen/smp.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 00c623bef72f..c51d1a699869 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c @@ -514,10 +514,10 @@ static int xen_cpu_disable(void) return 0; } -static void xen_cpu_die(unsigned int cpu) +static void xen_pv_cpu_die(unsigned int cpu) { - while (xen_pv_domain() && HYPERVISOR_vcpu_op(VCPUOP_is_up, - xen_vcpu_nr(cpu), NULL)) { + while (HYPERVISOR_vcpu_op(VCPUOP_is_up, + xen_vcpu_nr(cpu), NULL)) { __set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(HZ/10); } @@ -530,6 +530,15 @@ static void xen_cpu_die(unsigned int cpu) } } +static void xen_hvm_cpu_die(unsigned int cpu) +{ + if (common_cpu_die(cpu) == 0) { + xen_smp_intr_free(cpu); + xen_uninit_lock_cpu(cpu); + xen_teardown_timer(cpu); + } +} + static void xen_play_dead(void) /* used only with HOTPLUG_CPU */ { play_dead_common(); @@ -552,7 +561,12 @@ static int xen_cpu_disable(void) return -ENOSYS; } -static void xen_cpu_die(unsigned int cpu) +static void xen_pv_cpu_die(unsigned int cpu) +{ + BUG(); +} + +static void xen_hvm_cpu_die(unsigned int cpu) { BUG(); } @@ -733,7 +747,7 @@ static const struct smp_ops xen_smp_ops __initconst = { .smp_cpus_done = xen_smp_cpus_done, .cpu_up = xen_cpu_up, - .cpu_die = xen_cpu_die, + .cpu_die = xen_pv_cpu_die, .cpu_disable = xen_cpu_disable, .play_dead = xen_play_dead, @@ -762,7 +776,7 @@ void __init xen_hvm_smp_init(void) { smp_ops.smp_prepare_cpus = xen_hvm_smp_prepare_cpus; smp_ops.smp_send_reschedule = xen_smp_send_reschedule; - smp_ops.cpu_die = xen_cpu_die; + smp_ops.cpu_die = xen_hvm_cpu_die; smp_ops.send_call_func_ipi = xen_smp_send_call_function_ipi; smp_ops.send_call_func_single_ipi = xen_smp_send_call_function_single_ipi; smp_ops.smp_prepare_boot_cpu = xen_hvm_smp_prepare_boot_cpu; |