diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2016-04-01 12:10:06 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-04-01 12:10:06 +0200 |
| commit | c26e5f303a1e10a76dab81cd4c93dfec3a8bff6b (patch) | |
| tree | 3cf9b1b586c6240986a2b3156eeebe80c464dce2 /arch/arm64/include/asm/sysreg.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide (diff) | |
| parent | arm64: KVM: Register CPU notifiers when the kernel runs at HYP (diff) | |
| download | linux-dev-c26e5f303a1e10a76dab81cd4c93dfec3a8bff6b.tar.xz linux-dev-c26e5f303a1e10a76dab81cd4c93dfec3a8bff6b.zip | |
Merge tag 'kvm-arm-for-4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM Fixes for Linux v4.6-rc2.
Fixes a bug that corrupts stage-2 translationson 16-bit VMID equipped systems
and fixes CPU PM and Hotplug after the EL2 init code has been moved to C.
Diffstat (limited to 'arch/arm64/include/asm/sysreg.h')
| -rw-r--r-- | arch/arm64/include/asm/sysreg.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 1a78d6e2a78b..12874164b0ae 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -141,6 +141,9 @@ #define ID_AA64MMFR1_VMIDBITS_SHIFT 4 #define ID_AA64MMFR1_HADBS_SHIFT 0 +#define ID_AA64MMFR1_VMIDBITS_8 0 +#define ID_AA64MMFR1_VMIDBITS_16 2 + /* id_aa64mmfr2 */ #define ID_AA64MMFR2_UAO_SHIFT 4 |