From b05ffad0957014bc523b7dd22269b33a6ed1e603 Mon Sep 17 00:00:00 2001
From: Mike Waychison <mikew@google.com>
Date: Sat, 23 Jul 2011 00:31:45 -0700
Subject: [PATCH] --- yaml --- r: 271478 b: refs/heads/master c:
 d1613ad5d0018a009bd4865b0fa5930abb5ed259 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index beead03c291e..97bdf1668d71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14fa67ee95d4f7313fbf149fe37faccb903857c8
+refs/heads/master: d1613ad5d0018a009bd4865b0fa5930abb5ed259
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index e80f0d7c2c0d..6cb353c83a12 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -1826,7 +1826,8 @@ static int get_msr_hyperv(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)
 	case HV_X64_MSR_TPR:
 		return kvm_hv_vapic_msr_read(vcpu, APIC_TASKPRI, pdata);
 	case HV_X64_MSR_APIC_ASSIST_PAGE:
-		return vcpu->arch.hv_vapic;
+		data = vcpu->arch.hv_vapic;
+		break;
 	default:
 		pr_unimpl(vcpu, "Hyper-V unhandled rdmsr: 0x%x\n", msr);
 		return 1;