projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/big.LITTLE' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
kvm
/
vgic.c
diff --git
a/arch/arm/kvm/vgic.c
b/arch/arm/kvm/vgic.c
index 0e4cfe123b385339629499ae5dacb4f6f5e08ff6..17c5ac7d10ed173753dd96ae4a7b25aa3106998b 100644
(file)
--- a/
arch/arm/kvm/vgic.c
+++ b/
arch/arm/kvm/vgic.c
@@
-1477,7
+1477,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);