Merge branches 'pm-cpufreq', 'pm-sleep' and 'pm-em'

[linux-2.6-microblaze.git] / arch / arm64 / kvm / vgic / vgic-mmio-v2.c

diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v2.c b/arch/arm64/kvm/vgic/vgic-mmio-v2.c
index a016f07..5f9014a 100644 (file)
--- a/arch/arm64/kvm/vgic/vgic-mmio-v2.c
+++ b/arch/arm64/kvm/vgic/vgic-mmio-v2.c
@@ -282,7 +282,7 @@ static unsigned long vgic_mmio_read_vcpuif(struct kvm_vcpu *vcpu,
        case GIC_CPU_PRIMASK:
                /*
                 * Our KVM_DEV_TYPE_ARM_VGIC_V2 device ABI exports the
-                * the PMR field as GICH_VMCR.VMPriMask rather than
+                * PMR field as GICH_VMCR.VMPriMask rather than
                 * GICC_PMR.Priority, so we expose the upper five bits of
                 * priority mask to userspace using the lower bits in the
                 * unsigned long.
@@ -329,7 +329,7 @@ static void vgic_mmio_write_vcpuif(struct kvm_vcpu *vcpu,
        case GIC_CPU_PRIMASK:
                /*
                 * Our KVM_DEV_TYPE_ARM_VGIC_V2 device ABI exports the
-                * the PMR field as GICH_VMCR.VMPriMask rather than
+                * PMR field as GICH_VMCR.VMPriMask rather than
                 * GICC_PMR.Priority, so we expose the upper five bits of
                 * priority mask to userspace using the lower bits in the
                 * unsigned long.