From 6dc0bf83c4bca9a5e9476769f0209b53cb502cdc Mon Sep 17 00:00:00 2001
From: Arjan Koers <0h61vkll2ly8@xutrox.com>
Date: Mon, 2 Aug 2010 23:35:28 +0200
Subject: [PATCH] --- yaml --- r: 215913 b: refs/heads/master c:
 19b6a85b78a5d4b466c537bdbf0eaecae5e2c4e2 h: refs/heads/master i:   215911:
 a371a68997f5454b0dbe0e50a79f81b10b23d45e v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/kvmclock.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c6f617f3ba26..0972e0c34806 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c285545f813d7b0ce989fd34e42ad1fe785dc65d
+refs/heads/master: 19b6a85b78a5d4b466c537bdbf0eaecae5e2c4e2
diff --git a/trunk/arch/x86/kernel/kvmclock.c b/trunk/arch/x86/kernel/kvmclock.c
index eb9b76c716c2..ca43ce31a19c 100644
--- a/trunk/arch/x86/kernel/kvmclock.c
+++ b/trunk/arch/x86/kernel/kvmclock.c
@@ -128,13 +128,15 @@ static struct clocksource kvm_clock = {
 static int kvm_register_clock(char *txt)
 {
 	int cpu = smp_processor_id();
-	int low, high;
+	int low, high, ret;
+
 	low = (int)__pa(&per_cpu(hv_clock, cpu)) | 1;
 	high = ((u64)__pa(&per_cpu(hv_clock, cpu)) >> 32);
+	ret = native_write_msr_safe(msr_kvm_system_time, low, high);
 	printk(KERN_INFO "kvm-clock: cpu %d, msr %x:%x, %s\n",
 	       cpu, high, low, txt);
 
-	return native_write_msr_safe(msr_kvm_system_time, low, high);
+	return ret;
 }
 
 #ifdef CONFIG_X86_LOCAL_APIC