From 654517f0fcd98ceaae003ffdf56b6e5cc0b03a5d Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Thu, 18 Apr 2013 07:41:00 +0800
Subject: [PATCH] --- yaml --- r: 373077 b: refs/heads/master c:
 f1797359216c1daa145a354d07b8b2b7459668f4 h: refs/heads/master i:   373075:
 dd40bd3678c9f5e87886377d35b400e65c8786cd v: v3

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

diff --git a/[refs] b/[refs]
index a1f72d5fa72a..5a835d812629 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a1b9dd0006bce5cc770fd80bc95f9916670c151
+refs/heads/master: f1797359216c1daa145a354d07b8b2b7459668f4
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index 50e2e10b8041..cbe16b4cad5c 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -6752,8 +6752,10 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
 	}
 	vcpu->arch.mcg_cap = KVM_MAX_MCE_BANKS;
 
-	if (!zalloc_cpumask_var(&vcpu->arch.wbinvd_dirty_mask, GFP_KERNEL))
+	if (!zalloc_cpumask_var(&vcpu->arch.wbinvd_dirty_mask, GFP_KERNEL)) {
+		r = -ENOMEM;
 		goto fail_free_mce_banks;
+	}
 
 	r = fx_init(vcpu);
 	if (r)