aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kvm
diff options
context:
space:
mode:
authorHollis Blanchard <hollisb@us.ibm.com>2009-01-03 17:23:12 -0500
committerAvi Kivity <avi@redhat.com>2009-03-24 05:02:59 -0400
commitbdc89f13ec955c14777d5caf02dfca3f51d639bd (patch)
tree3c85ecba0c0a14556c7cac6cfb287dd74944989e /arch/powerpc/kvm
parentb52a638c391c5c7b013180f5374274698b8535c8 (diff)
KVM: ppc: distinguish between interrupts and priorities
Although BOOKE_MAX_INTERRUPT has the right value, the meaning is not match. Signed-off-by: Liu Yu <yu.liu@freescale.com> Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/powerpc/kvm')
-rw-r--r--arch/powerpc/kvm/booke.c2
-rw-r--r--arch/powerpc/kvm/booke.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index 933c406c7915..f192fbee2f29 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -163,7 +163,7 @@ void kvmppc_core_deliver_interrupts(struct kvm_vcpu *vcpu)
163 unsigned int priority; 163 unsigned int priority;
164 164
165 priority = __ffs(*pending); 165 priority = __ffs(*pending);
166 while (priority <= BOOKE_MAX_INTERRUPT) { 166 while (priority <= BOOKE_IRQPRIO_MAX) {
167 if (kvmppc_booke_irqprio_deliver(vcpu, priority)) 167 if (kvmppc_booke_irqprio_deliver(vcpu, priority))
168 break; 168 break;
169 169
diff --git a/arch/powerpc/kvm/booke.h b/arch/powerpc/kvm/booke.h
index 311fdbc23fbe..7ceeb3e739b4 100644
--- a/arch/powerpc/kvm/booke.h
+++ b/arch/powerpc/kvm/booke.h
@@ -42,6 +42,7 @@
42#define BOOKE_IRQPRIO_EXTERNAL 13 42#define BOOKE_IRQPRIO_EXTERNAL 13
43#define BOOKE_IRQPRIO_FIT 14 43#define BOOKE_IRQPRIO_FIT 14
44#define BOOKE_IRQPRIO_DECREMENTER 15 44#define BOOKE_IRQPRIO_DECREMENTER 15
45#define BOOKE_IRQPRIO_MAX 15
45 46
46/* Helper function for "full" MSR writes. No need to call this if only EE is 47/* Helper function for "full" MSR writes. No need to call this if only EE is
47 * changing. */ 48 * changing. */