From 7970d07f06c6ca0d2c93949213f6bd3a1e5f4d85 Mon Sep 17 00:00:00 2001
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Fri, 1 Oct 2010 17:35:46 +0100
Subject: [PATCH] --- yaml --- r: 211281 b: refs/heads/master c:
 31e7e931cdc27f76dc68444edc4df1c0d1bfa6cc h: refs/heads/master i:   211279:
 4b2b618498d15c6c11ffd37cb71e4f1212f82871 v: v3

---
 [refs]                    | 2 +-
 trunk/arch/x86/xen/time.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index abfa36a834b8..8324023ed06c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a947f0f8f7012a5e8689a9cff7209ec6964ec154
+refs/heads/master: 31e7e931cdc27f76dc68444edc4df1c0d1bfa6cc
diff --git a/trunk/arch/x86/xen/time.c b/trunk/arch/x86/xen/time.c
index 1a5353a753fc..b2bb5aa3b054 100644
--- a/trunk/arch/x86/xen/time.c
+++ b/trunk/arch/x86/xen/time.c
@@ -489,8 +489,9 @@ static void xen_hvm_setup_cpu_clockevents(void)
 __init void xen_hvm_init_time_ops(void)
 {
 	/* vector callback is needed otherwise we cannot receive interrupts
-	 * on cpu > 0 */
-	if (!xen_have_vector_callback && num_present_cpus() > 1)
+	 * on cpu > 0 and at this point we don't know how many cpus are
+	 * available */
+	if (!xen_have_vector_callback)
 		return;
 	if (!xen_feature(XENFEAT_hvm_safe_pvclock)) {
 		printk(KERN_INFO "Xen doesn't support pvclock on HVM,"