From 33436481bb9ccdbe23b1ffcb02d3b4986fe9c774 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Wed, 17 Aug 2011 15:15:00 +0200 Subject: [PATCH] --- yaml --- r: 263176 b: refs/heads/master c: 3c05c4bed4ccce3f22f6d7899b308faae24ad198 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/xen/smp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7d9484f2d034..5759a33be054 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ccbcdf7cf1b5f6c6db30d84095b9c6c53043af55 +refs/heads/master: 3c05c4bed4ccce3f22f6d7899b308faae24ad198 diff --git a/trunk/arch/x86/xen/smp.c b/trunk/arch/x86/xen/smp.c index b4533a86d7e4..e79dbb95482b 100644 --- a/trunk/arch/x86/xen/smp.c +++ b/trunk/arch/x86/xen/smp.c @@ -521,8 +521,6 @@ static void __init xen_hvm_smp_prepare_cpus(unsigned int max_cpus) native_smp_prepare_cpus(max_cpus); WARN_ON(xen_smp_intr_init(0)); - if (!xen_have_vector_callback) - return; xen_init_lock_cpu(0); xen_init_spinlocks(); } @@ -546,6 +544,8 @@ static void xen_hvm_cpu_die(unsigned int cpu) void __init xen_hvm_smp_init(void) { + if (!xen_have_vector_callback) + return; smp_ops.smp_prepare_cpus = xen_hvm_smp_prepare_cpus; smp_ops.smp_send_reschedule = xen_smp_send_reschedule; smp_ops.cpu_up = xen_hvm_cpu_up;