diff options
| author | Marc Zyngier | 2012-12-12 15:37:10 +0100 |
|---|---|---|
| committer | Christoffer Dall | 2013-03-07 00:48:44 +0100 |
| commit | d7bb077737f34ed474a7256e1f368df6373238fa (patch) | |
| tree | a8c9672f27ee4ab35f02eb58fe89529d41c3fb04 /arch/arm/kvm | |
| parent | ARM: KVM: fix fault_ipa computing (diff) | |
| download | kernel-qcow2-linux-d7bb077737f34ed474a7256e1f368df6373238fa.tar.gz kernel-qcow2-linux-d7bb077737f34ed474a7256e1f368df6373238fa.tar.xz kernel-qcow2-linux-d7bb077737f34ed474a7256e1f368df6373238fa.zip | |
ARM: KVM: vgic: decouple alignment restriction from page size
The virtual GIC is supposed to be 4kB aligned. On a 64kB page
system, comparing the alignment to PAGE_SIZE is wrong.
Use SZ_4K instead.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/kvm')
| -rw-r--r-- | arch/arm/kvm/vgic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kvm/vgic.c b/arch/arm/kvm/vgic.c index c9a17316e9fe..161d5c15f0f0 100644 --- a/arch/arm/kvm/vgic.c +++ b/arch/arm/kvm/vgic.c @@ -1484,7 +1484,7 @@ int kvm_vgic_set_addr(struct kvm *kvm, unsigned long type, u64 addr) if (addr & ~KVM_PHYS_MASK) return -E2BIG; - if (addr & ~PAGE_MASK) + if (addr & (SZ_4K - 1)) return -EINVAL; mutex_lock(&kvm->lock); |