summaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-04-22 11:06:58 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2009-04-22 11:06:58 +1000
commitdf299db2074628ab4f60f7a82724bbe0d89d9051 (patch)
treea7b32f65ff3adc97bb8d9099a5d56319b7e4df3f /arch/powerpc
parenta28c59def09eceb419b87995e22765fa916d095f (diff)
parentb59cd35601114cd4ab42af36d972051e3a0db4b7 (diff)
Merge commit 'kvm/master'
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/kvm/powerpc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 9057335fdc61..2cf915e51e7e 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -41,6 +41,12 @@ int kvm_cpu_has_interrupt(struct kvm_vcpu *v)
return !!(v->arch.pending_exceptions);
}
+int kvm_arch_interrupt_allowed(struct kvm_vcpu *vcpu)
+{
+ /* do real check here */
+ return 1;
+}
+
int kvm_arch_vcpu_runnable(struct kvm_vcpu *v)
{
return !(v->arch.msr & MSR_WE);