diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-08 13:48:00 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-08 13:48:00 +0300 |
| commit | a1a8ba2d4a7cf9884b97b733b45692f9114c5132 (patch) | |
| tree | 3b342c5071c347bdfa0fe6bf9274c30c75ea18d3 /arch/arm64/include/asm/kvm_arm.h | |
| parent | b2f9d678e28ca71ce650eac82f26dd287b47e89a (diff) | |
| parent | e2857b8f11a289ed2b61d18d0665e05c1053c446 (diff) | |
| download | linux-a1a8ba2d4a7cf9884b97b733b45692f9114c5132.tar.xz | |
Merge branch 'linus' into ras/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/kvm_arm.h')
| -rw-r--r-- | arch/arm64/include/asm/kvm_arm.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index bef6e9243c63..d201d4b396d1 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -107,8 +107,6 @@ #define TCR_EL2_MASK (TCR_EL2_TG0 | TCR_EL2_SH0 | \ TCR_EL2_ORGN0 | TCR_EL2_IRGN0 | TCR_EL2_T0SZ) -#define TCR_EL2_FLAGS (TCR_EL2_RES1 | TCR_EL2_PS_40B) - /* VTCR_EL2 Registers bits */ #define VTCR_EL2_RES1 (1 << 31) #define VTCR_EL2_PS_MASK (7 << 16) |