From: Marc Zyngier <marc.zyngier@arm.com>
Date: Wed, 12 Dec 2012 14:37:10 +0000 (+0000)
Subject: ARM: KVM: vgic: decouple alignment restriction from page size
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d7bb077737f34ed474a7256e1f368df6373238fa;p=linux-beck.git

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>
---

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);