| Message ID | 20170503183300.4618-4-cdall@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 03/05/17 19:32, Christoffer Dall wrote: > We are about to need this define in the arch timer code as well so move > it to a common location. > > Signed-off-by: Christoffer Dall <cdall@linaro.org> > --- > include/kvm/arm_vgic.h | 2 ++ > virt/kvm/arm/pmu.c | 2 -- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h > index 26ed4fb..1541f5d 100644 > --- a/include/kvm/arm_vgic.h > +++ b/include/kvm/arm_vgic.h > @@ -38,6 +38,8 @@ > #define VGIC_MIN_LPI 8192 > #define KVM_IRQCHIP_NUM_PINS (1020 - 32) > > +#define irq_is_ppi(irq) ((irq) >= VGIC_NR_SGIS && (irq) < VGIC_NR_PRIVATE_IRQS) > + > enum vgic_type { > VGIC_V2, /* Good ol' GICv2 */ > VGIC_V3, /* New fancy GICv3 */ > diff --git a/virt/kvm/arm/pmu.c b/virt/kvm/arm/pmu.c > index f046b08..9b3e3ea 100644 > --- a/virt/kvm/arm/pmu.c > +++ b/virt/kvm/arm/pmu.c > @@ -481,8 +481,6 @@ static int kvm_arm_pmu_v3_init(struct kvm_vcpu *vcpu) > return 0; > } > > -#define irq_is_ppi(irq) ((irq) >= VGIC_NR_SGIS && (irq) < VGIC_NR_PRIVATE_IRQS) > - > /* > * For one VM the interrupt type must be same for each vcpu. > * As a PPI, the interrupt number is the same for all vcpus, > Acked-by: Marc Zyngier <marc.zyngier@arm.com> M.
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index 26ed4fb..1541f5d 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -38,6 +38,8 @@ #define VGIC_MIN_LPI 8192 #define KVM_IRQCHIP_NUM_PINS (1020 - 32) +#define irq_is_ppi(irq) ((irq) >= VGIC_NR_SGIS && (irq) < VGIC_NR_PRIVATE_IRQS) + enum vgic_type { VGIC_V2, /* Good ol' GICv2 */ VGIC_V3, /* New fancy GICv3 */ diff --git a/virt/kvm/arm/pmu.c b/virt/kvm/arm/pmu.c index f046b08..9b3e3ea 100644 --- a/virt/kvm/arm/pmu.c +++ b/virt/kvm/arm/pmu.c @@ -481,8 +481,6 @@ static int kvm_arm_pmu_v3_init(struct kvm_vcpu *vcpu) return 0; } -#define irq_is_ppi(irq) ((irq) >= VGIC_NR_SGIS && (irq) < VGIC_NR_PRIVATE_IRQS) - /* * For one VM the interrupt type must be same for each vcpu. * As a PPI, the interrupt number is the same for all vcpus,
We are about to need this define in the arch timer code as well so move it to a common location. Signed-off-by: Christoffer Dall <cdall@linaro.org> --- include/kvm/arm_vgic.h | 2 ++ virt/kvm/arm/pmu.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)