From 0e6eb0c082ced4f21e51345802e5e29becfc27fb Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 13 Mar 2012 23:31:02 +0100 Subject: [PATCH] --- yaml --- r: 298889 b: refs/heads/master c: 592f5d87b3feee9d60411f19d583038c0c7670ad h: refs/heads/master i: 298887: b73fc4e4212d92fbc5ad16a9255f4c7057401ed3 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/book3s_pr.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e68ff2714099..cc3d89cefec6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1f8acf8380abfd52aefbfa524e74af5ce0c8492 +refs/heads/master: 592f5d87b3feee9d60411f19d583038c0c7670ad diff --git a/trunk/arch/powerpc/kvm/book3s_pr.c b/trunk/arch/powerpc/kvm/book3s_pr.c index a657c44b7fbc..7759053d391b 100644 --- a/trunk/arch/powerpc/kvm/book3s_pr.c +++ b/trunk/arch/powerpc/kvm/book3s_pr.c @@ -777,6 +777,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, } } + preempt_disable(); if (!(r & RESUME_HOST)) { /* To avoid clobbering exit_reason, only check for signals if * we aren't already exiting to userspace for some other @@ -798,8 +799,6 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, run->exit_reason = KVM_EXIT_INTR; r = -EINTR; } else { - preempt_disable(); - /* In case an interrupt came in that was triggered * from userspace (like DEC), we need to check what * to inject now! */