diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2015-09-17 16:51:59 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-09-17 16:51:59 +0200 |
commit | efe4d36a75d4dfd1a9c161b2bbf9b90beb4d9648 (patch) | |
tree | e7261ab57ded208c8425797e052ae562343ee618 /arch/arm64/include/asm/kvm_arm.h | |
parent | KVM: s390: Replace incorrect atomic_or with atomic_andnot (diff) | |
parent | arm/arm64: KVM: Remove 'config KVM_ARM_MAX_VCPUS' (diff) | |
download | linux-dev-efe4d36a75d4dfd1a9c161b2bbf9b90beb4d9648.tar.xz linux-dev-efe4d36a75d4dfd1a9c161b2bbf9b90beb4d9648.zip |
Merge tag 'kvm-arm-for-4.3-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
Second set of KVM/ARM changes for 4.3-rc2
- Workaround for a Cortex-A57 erratum
- Bug fix for the debugging infrastructure
- Fix for 32bit guests with more than 4GB of address space
on a 32bit host
- A number of fixes for the (unusual) case when we don't use
the in-kernel GIC emulation
- Removal of ThumbEE handling on arm64, since these have been
dropped from the architecture before anyone actually ever
built a CPU
- Remove the KVM_ARM_MAX_VCPUS limitation which has become
fairly pointless
Diffstat (limited to 'arch/arm64/include/asm/kvm_arm.h')
-rw-r--r-- | arch/arm64/include/asm/kvm_arm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index cbc5e1a0ea8f..9694f2654593 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -172,7 +172,6 @@ #define VTTBR_VMID_MASK (UL(0xFF) << VTTBR_VMID_SHIFT) /* Hyp System Trap Register */ -#define HSTR_EL2_TTEE (1 << 16) #define HSTR_EL2_T(x) (1 << x) /* Hyp Coproccessor Trap Register Shifts */ |