X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=arch%2Fx86%2Fxen%2Fenlighten.c;fp=arch%2Fx86%2Fxen%2Fenlighten.c;h=044f5d9bd757db0a9e0fb6977cd40e340a8922c0;hp=69b9ef6ce55a0ecadf182891511b93eaedccbae2;hb=0bd5ff02f874986f30455d41222d53bd1846aa0e;hpb=abfcdd7ef364708e54276e97041fe4dc1dd8dc12

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 69b9ef6ce55a..044f5d9bd757 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1391,8 +1391,11 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self,
 	switch (action) {
 	case CPU_UP_PREPARE:
 		xen_vcpu_setup(cpu);
-		if (xen_have_vector_callback)
+		if (xen_have_vector_callback) {
 			xen_init_lock_cpu(cpu);
+			if (xen_feature(XENFEAT_hvm_safe_pvclock))
+				xen_setup_timer(cpu);
+		}
 		break;
 	default:
 		break;