diff options
author | Marc Zyngier <maz@kernel.org> | 2022-05-16 17:48:36 +0100 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2022-05-16 17:48:36 +0100 |
commit | 822ca7f82b21822bb7435a6d76feffe60a86ec40 (patch) | |
tree | 542fe28b5d12952ad490842e7faf0fc4915a5021 /arch/arm64/include/asm/kvm_host.h | |
parent | Merge branch kvm-arm64/per-vcpu-host-pmu-data into kvmarm-master/next (diff) | |
parent | KVM: arm64: vgic-v3: List M1 Pro/Max as requiring the SEIS workaround (diff) | |
download | linux-dev-822ca7f82b21822bb7435a6d76feffe60a86ec40.tar.xz linux-dev-822ca7f82b21822bb7435a6d76feffe60a86ec40.zip |
Merge branch kvm-arm64/misc-5.19 into kvmarm-master/next
* kvm-arm64/misc-5.19:
: .
: Misc fixes and general improvements for KVMM/arm64:
:
: - Better handle out of sequence sysregs in the global tables
:
: - Remove a couple of unnecessary loads from constant pool
:
: - Drop unnecessary pKVM checks
:
: - Add all known M1 implementations to the SEIS workaround
:
: - Cleanup kerneldoc warnings
: .
KVM: arm64: vgic-v3: List M1 Pro/Max as requiring the SEIS workaround
KVM: arm64: pkvm: Don't mask already zeroed FEAT_SVE
KVM: arm64: pkvm: Drop unnecessary FP/SIMD trap handler
KVM: arm64: nvhe: Eliminate kernel-doc warnings
KVM: arm64: Avoid unnecessary absolute addressing via literals
KVM: arm64: Print emulated register table name when it is unsorted
KVM: arm64: Don't BUG_ON() if emulated register table is unsorted
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/kvm_host.h')
-rw-r--r-- | arch/arm64/include/asm/kvm_host.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 298dd76730c8..026e91b8d00b 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -705,7 +705,7 @@ int kvm_handle_cp10_id(struct kvm_vcpu *vcpu); void kvm_reset_sys_regs(struct kvm_vcpu *vcpu); -void kvm_sys_reg_table_init(void); +int kvm_sys_reg_table_init(void); /* MMIO helpers */ void kvm_mmio_write_buf(void *buf, unsigned int len, unsigned long data); |