From 50e83eb328b8f27b4e5dc483d60012ec8507d008 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Sun, 2 Dec 2012 11:04:14 +0100
Subject: [PATCH] --- yaml --- r: 343554 b: refs/heads/master c:
 45e3cc7d9fe69844cd12d51c511e1e98d156bbe1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index be9249dc7d82..97b52107d030 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba904635d498fea43fc3610983f9dc430ac324e4
+refs/heads/master: 45e3cc7d9fe69844cd12d51c511e1e98d156bbe1
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index b0b8abe688ce..3bdaf298b8c7 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -3006,6 +3006,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
 		break;
 	}
 	case KVM_SET_LAPIC: {
+		r = -EINVAL;
 		if (!vcpu->arch.apic)
 			goto out;
 		u.lapic = memdup_user(argp, sizeof(*u.lapic));