From 4d840c3cf5b299ec91b5e8fb372f93d9a9024888 Mon Sep 17 00:00:00 2001 From: Hollis Blanchard Date: Sat, 3 Jan 2009 16:23:12 -0600 Subject: [PATCH] --- yaml --- r: 133701 b: refs/heads/master c: bdc89f13ec955c14777d5caf02dfca3f51d639bd h: refs/heads/master i: 133699: 9dfc3e85644d69f72de96bc66cd4b705f1ce8c1e v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/booke.c | 2 +- trunk/arch/powerpc/kvm/booke.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ea95f8a1d8d2..07be54536adb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b52a638c391c5c7b013180f5374274698b8535c8 +refs/heads/master: bdc89f13ec955c14777d5caf02dfca3f51d639bd diff --git a/trunk/arch/powerpc/kvm/booke.c b/trunk/arch/powerpc/kvm/booke.c index 933c406c7915..f192fbee2f29 100644 --- a/trunk/arch/powerpc/kvm/booke.c +++ b/trunk/arch/powerpc/kvm/booke.c @@ -163,7 +163,7 @@ void kvmppc_core_deliver_interrupts(struct kvm_vcpu *vcpu) unsigned int priority; priority = __ffs(*pending); - while (priority <= BOOKE_MAX_INTERRUPT) { + while (priority <= BOOKE_IRQPRIO_MAX) { if (kvmppc_booke_irqprio_deliver(vcpu, priority)) break; diff --git a/trunk/arch/powerpc/kvm/booke.h b/trunk/arch/powerpc/kvm/booke.h index 311fdbc23fbe..7ceeb3e739b4 100644 --- a/trunk/arch/powerpc/kvm/booke.h +++ b/trunk/arch/powerpc/kvm/booke.h @@ -42,6 +42,7 @@ #define BOOKE_IRQPRIO_EXTERNAL 13 #define BOOKE_IRQPRIO_FIT 14 #define BOOKE_IRQPRIO_DECREMENTER 15 +#define BOOKE_IRQPRIO_MAX 15 /* Helper function for "full" MSR writes. No need to call this if only EE is * changing. */