aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-04-05 18:30:03 +0100
committerMark Brown <broonie@kernel.org>2018-04-05 18:30:03 +0100
commit105df41d14bbe70e5c2b51ee7f4ca20d09f2a8bc (patch)
tree95f706cd55cb28067ee393c942b35b3e7019c8ce
parent1aea93a3ac75a18509820fac25cddcdfe3232f5a (diff)
parent2da9deac1e123ce8f9c22919f9f49b3a50d0c3fd (diff)
downloadlinux-linaro-stable-linux-linaro-lsk-v4.4-rt-test.tar.gz
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-rtlinux-linaro-lsk-v4.4-rt-testlinux-linaro-lsk-v4.4-rt
-rw-r--r--arch/arm/include/asm/kvm_arm.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/include/asm/kvm_arm.h b/arch/arm/include/asm/kvm_arm.h
index a3f0b3d..98d6de1 100644
--- a/arch/arm/include/asm/kvm_arm.h
+++ b/arch/arm/include/asm/kvm_arm.h
@@ -161,8 +161,7 @@
#else
#define VTTBR_X (5 - KVM_T0SZ)
#endif
-#define VTTBR_BADDR_SHIFT (VTTBR_X - 1)
-#define VTTBR_BADDR_MASK (((_AC(1, ULL) << (40 - VTTBR_X)) - 1) << VTTBR_BADDR_SHIFT)
+#define VTTBR_BADDR_MASK (((_AC(1, ULL) << (40 - VTTBR_X)) - 1) << VTTBR_X)
#define VTTBR_VMID_SHIFT _AC(48, ULL)
#define VTTBR_VMID_MASK(size) (_AT(u64, (1 << size) - 1) << VTTBR_VMID_SHIFT)