aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-06 09:51:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-06 09:51:28 -0700
commit34984f54b7e8cb29632e921fb2f47b403c0e617a (patch)
tree76a900f41782ab78eb2c96ee2b6ff81c9f3bf1b3 /arch
parent8fe9793af04e2a63257dd620984ca912a6a40965 (diff)
parent31e7e931cdc27f76dc68444edc4df1c0d1bfa6cc (diff)
downloadmrst-s0i3-test-34984f54b7e8cb29632e921fb2f47b403c0e617a.tar.gz
mrst-s0i3-test-34984f54b7e8cb29632e921fb2f47b403c0e617a.tar.xz
mrst-s0i3-test-34984f54b7e8cb29632e921fb2f47b403c0e617a.zip
Merge branch 'v2.6.36-rc6-urgent-fixes' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm
* 'v2.6.36-rc6-urgent-fixes' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm: xen: do not initialize PV timers on HVM if !xen_have_vector_callback xen: do not set xenstored_ready before xenbus_probe on hvm
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/xen/time.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index 1a5353a753f..b2bb5aa3b05 100644
--- a/arch/x86/xen/time.c
+++ b/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,"