diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-02-16 18:51:55 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-02-16 18:51:55 +0100 |
| commit | c53d7a846ee7273c21ca317500480eb7dcdd2c5a (patch) | |
| tree | 100375bae0a491968cc65d717bf96d1b8b38e840 /arch/arm64/include | |
| parent | c05235d50f681bf685e7290cae05ab3b4fa493f3 (diff) | |
| parent | 3c5b1d92b3b02be07873d611a27950addff544d3 (diff) | |
| download | linux-c53d7a846ee7273c21ca317500480eb7dcdd2c5a.tar.bz2 | |
Merge tag 'kvm-arm-for-4.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/ARM fixes for 4.5-rc4
- Fix for an unpleasant crash when the VM is created without a timer
- Allow HYP mode to access the full PA space, and not only 40bit
Diffstat (limited to 'arch/arm64/include')
| -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) |