diff options
author | David Woodhouse <dwmw@amazon.co.uk> | 2021-01-06 15:39:57 +0000 |
---|---|---|
committer | Juergen Gross <jgross@suse.com> | 2021-01-13 16:12:07 +0100 |
commit | 4621dc6a5bf1235249e92231db30c96dfd1a18b9 (patch) | |
tree | 58daedb88ca2b866066228d0e44bbb6779745a79 /arch/x86/xen | |
parent | b36b0fe96af13460278bf9b173beced1bd15f85d (diff) | |
download | linux-stable-4621dc6a5bf1235249e92231db30c96dfd1a18b9.tar.gz linux-stable-4621dc6a5bf1235249e92231db30c96dfd1a18b9.tar.bz2 linux-stable-4621dc6a5bf1235249e92231db30c96dfd1a18b9.zip |
x86/xen: Don't register Xen IPIs when they aren't going to be used
In the case where xen_have_vector_callback is false, we still register
the IPI vectors in xen_smp_intr_init() for the secondary CPUs even
though they aren't going to be used. Stop doing that.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Link: https://lore.kernel.org/r/20210106153958.584169-5-dwmw2@infradead.org
Signed-off-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'arch/x86/xen')
-rw-r--r-- | arch/x86/xen/enlighten_hvm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/enlighten_hvm.c b/arch/x86/xen/enlighten_hvm.c index ec50b7423a4c..e68ea5f4ad1c 100644 --- a/arch/x86/xen/enlighten_hvm.c +++ b/arch/x86/xen/enlighten_hvm.c @@ -164,10 +164,10 @@ static int xen_cpu_up_prepare_hvm(unsigned int cpu) else per_cpu(xen_vcpu_id, cpu) = cpu; rc = xen_vcpu_setup(cpu); - if (rc) + if (rc || !xen_have_vector_callback) return rc; - if (xen_have_vector_callback && xen_feature(XENFEAT_hvm_safe_pvclock)) + if (xen_feature(XENFEAT_hvm_safe_pvclock)) xen_setup_timer(cpu); rc = xen_smp_intr_init(cpu); |