aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/i8259.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-09-24 15:37:33 +1000
committerDave Airlie <airlied@redhat.com>2010-09-24 15:37:33 +1000
commit4a445f291ac3faa08f56eaeb6e44856b6b72b74c (patch)
treeb66cc93311dc4c623113a87aa9b40730a21ac18e /arch/x86/kvm/i8259.c
parentcbc60ca04b342a4e1f2a1086a7277c077f07dbed (diff)
parenta850ea30374ebed32a0724742601861853fde869 (diff)
downloadkernel_goldelico_gta04-4a445f291ac3faa08f56eaeb6e44856b6b72b74c.zip
kernel_goldelico_gta04-4a445f291ac3faa08f56eaeb6e44856b6b72b74c.tar.gz
kernel_goldelico_gta04-4a445f291ac3faa08f56eaeb6e44856b6b72b74c.tar.bz2
Merge remote branch 'origin/master' of /home/airlied/kernel//linux-2.6 into drm-core-next
Diffstat (limited to 'arch/x86/kvm/i8259.c')
-rw-r--r--arch/x86/kvm/i8259.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c
index 8d10c06..4b7b73c 100644
--- a/arch/x86/kvm/i8259.c
+++ b/arch/x86/kvm/i8259.c
@@ -64,6 +64,9 @@ static void pic_unlock(struct kvm_pic *s)
if (!found)
found = s->kvm->bsp_vcpu;
+ if (!found)
+ return;
+
kvm_vcpu_kick(found);
}
}