diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-03-25 11:46:10 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-03-25 11:46:10 -0700 |
| commit | 5acac83bf2e42f51ab9fd315d657798754bf0bb8 (patch) | |
| tree | 564be60664226649f00798cc3afb72d72d0ed24d /arch/arm64/kernel/image-vars.h | |
| parent | Input: cyttsp - verbose error on soft reset (diff) | |
| parent | Linux 5.12-rc4 (diff) | |
| download | linux-dev-5acac83bf2e42f51ab9fd315d657798754bf0bb8.tar.xz linux-dev-5acac83bf2e42f51ab9fd315d657798754bf0bb8.zip | |
Merge tag 'v5.12-rc4' into next
Sync up with the mainline to bring in newest APIs.
Diffstat (limited to 'arch/arm64/kernel/image-vars.h')
| -rw-r--r-- | arch/arm64/kernel/image-vars.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/kernel/image-vars.h b/arch/arm64/kernel/image-vars.h index f676243abac6..5aa9ed1e9ec6 100644 --- a/arch/arm64/kernel/image-vars.h +++ b/arch/arm64/kernel/image-vars.h @@ -64,7 +64,6 @@ __efistub__ctype = _ctype; /* Alternative callbacks for init-time patching of nVHE hyp code. */ KVM_NVHE_ALIAS(kvm_patch_vector_branch); KVM_NVHE_ALIAS(kvm_update_va_mask); -KVM_NVHE_ALIAS(kvm_update_kimg_phys_offset); KVM_NVHE_ALIAS(kvm_get_kimage_voffset); /* Global kernel state accessed by nVHE hyp code. */ @@ -102,6 +101,9 @@ KVM_NVHE_ALIAS(__stop___kvm_ex_table); /* Array containing bases of nVHE per-CPU memory regions. */ KVM_NVHE_ALIAS(kvm_arm_hyp_percpu_base); +/* PMU available static key */ +KVM_NVHE_ALIAS(kvm_arm_pmu_available); + #endif /* CONFIG_KVM */ #endif /* __ARM64_KERNEL_IMAGE_VARS_H */ |