diff options
| author | Marc Zyngier <maz@kernel.org> | 2022-02-08 15:29:28 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2022-02-08 15:29:28 +0000 |
| commit | c30185412daf353e6bcc61cd50ee7b7eadf42d1e (patch) | |
| tree | 308b3d59881d7ef8281c506fe0b6f4992d91ceac /include/kvm | |
| parent | 5206b980310141573ab111342dde50ad21abdb88 (diff) | |
| parent | 4c68d6c0a1757139c791ccf1a781cbd81e35a063 (diff) | |
Merge branch kvm-arm64/misc-5.18 into kvmarm-master/next
* kvm-arm64/misc-5.18:
: .
: Misc fixes for KVM/arm64 5.18:
:
: - Drop unused kvm parameter to kvm_psci_version()
:
: - Implement CONFIG_DEBUG_LIST at EL2
: .
KVM: arm64: pkvm: Implement CONFIG_DEBUG_LIST at EL2
KVM: arm64: Drop unused param from kvm_psci_version()
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'include/kvm')
| -rw-r--r-- | include/kvm/arm_psci.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/kvm/arm_psci.h b/include/kvm/arm_psci.h index 5b58bd2fe088..297645edcaff 100644 --- a/include/kvm/arm_psci.h +++ b/include/kvm/arm_psci.h @@ -16,11 +16,7 @@ #define KVM_ARM_PSCI_LATEST KVM_ARM_PSCI_1_0 -/* - * We need the KVM pointer independently from the vcpu as we can call - * this from HYP, and need to apply kern_hyp_va on it... - */ -static inline int kvm_psci_version(struct kvm_vcpu *vcpu, struct kvm *kvm) +static inline int kvm_psci_version(struct kvm_vcpu *vcpu) { /* * Our PSCI implementation stays the same across versions from |