]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
Merge branch kvm-arm64/pkvm-psci into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Wed, 8 Apr 2026 11:23:24 +0000 (12:23 +0100)
committerMarc Zyngier <maz@kernel.org>
Wed, 8 Apr 2026 11:23:24 +0000 (12:23 +0100)
commitb693940e81318d5cf4432afc97be5e22e541e2fd
tree80dcd8b9ca734bfceb4b6a03ac72edeb705bfdba
parente85d1c0cc77b08b21a44912d69d0c0c405b1808c
parent54a3cc145456272b10c1452fe89e1dcf933d5c39
Merge branch kvm-arm64/pkvm-psci into kvmarm-master/next

* kvm-arm64/pkvm-psci:
  : .
  : Cleanup of the pKVM PSCI relay CPU entry code, making it slightly
  : easier to follow, should someone have to wade into these waters
  : ever again.
  : .
  KVM: arm64: Remove extra ISBs when using msr_hcr_el2
  KVM: arm64: pkvm: Use direct function pointers for cpu_{on,resume}
  KVM: arm64: pkvm: Turn __kvm_hyp_init_cpu into an inner label
  KVM: arm64: pkvm: Simplify BTI handling on CPU boot
  KVM: arm64: pkvm: Move error handling to the end of kvm_hyp_cpu_entry

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/include/asm/el2_setup.h
arch/arm64/include/asm/kvm_asm.h
arch/arm64/include/asm/sysreg.h
arch/arm64/kvm/hyp/nvhe/host.S
arch/arm64/kvm/hyp/nvhe/psci-relay.c