diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-12-07 09:14:53 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-12-07 09:14:53 +0000 |
| commit | 94b4a6d52173521b63b11516fe963d651dc520a4 (patch) | |
| tree | 857ba45ac7bfdfd80653958048205192b7668196 /arch/arm64/include | |
| parent | 370a17f531f1736b7f17d9ac3fb8ef1013d956fd (diff) | |
| parent | f0e6e6fa41b3d2aa1dcb61dd4ed6d7be004bb5a8 (diff) | |
| download | linux-94b4a6d52173521b63b11516fe963d651dc520a4.tar.bz2 | |
Merge branch kvm-arm64/misc-5.17 into kvmarm-master/next
* kvm-arm64/misc-5.17:
: .
: - Add minimal support for ARMv8.7's PMU extension
: - Constify kvm_io_gic_ops
: - Drop kvm_is_transparent_hugepage() prototype
: .
KVM: Drop stale kvm_is_transparent_hugepage() declaration
KVM: arm64: Constify kvm_io_gic_ops
KVM: arm64: Add minimal handling for the ARMv8.7 PMU
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/sysreg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 16b3f1a1d468..615dd6278f8b 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -937,6 +937,7 @@ #define ID_AA64DFR0_PMUVER_8_1 0x4 #define ID_AA64DFR0_PMUVER_8_4 0x5 #define ID_AA64DFR0_PMUVER_8_5 0x6 +#define ID_AA64DFR0_PMUVER_8_7 0x7 #define ID_AA64DFR0_PMUVER_IMP_DEF 0xf #define ID_AA64DFR0_PMSVER_8_2 0x1 |