OSDN Git Service

Merge branch 'kvm-arm64/hyp-pcpu' into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Wed, 30 Sep 2020 13:05:35 +0000 (14:05 +0100)
committerMarc Zyngier <maz@kernel.org>
Wed, 30 Sep 2020 13:05:35 +0000 (14:05 +0100)
commit14ef9d04928b61d699fd0dd858b14b5d8150113e
tree267d772b7068f7d0da04cf421286c65f2599f472
parent2e02cbb236d6ac12e04629f94b7032a94f968165
parent816c347f3a48fb15370b23664760ea61286fea05
Merge branch 'kvm-arm64/hyp-pcpu' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>
14 files changed:
arch/arm64/include/asm/kvm_asm.h
arch/arm64/include/asm/kvm_host.h
arch/arm64/include/asm/kvm_mmu.h
arch/arm64/include/uapi/asm/kvm.h
arch/arm64/kvm/arm.c
arch/arm64/kvm/hyp/Makefile
arch/arm64/kvm/hyp/entry.S
arch/arm64/kvm/hyp/hyp-entry.S
arch/arm64/kvm/hyp/include/hyp/switch.h
arch/arm64/kvm/hyp/nvhe/Makefile
arch/arm64/kvm/hyp/nvhe/switch.c
arch/arm64/kvm/hyp/vhe/switch.c
arch/arm64/kvm/reset.c
arch/arm64/kvm/sys_regs.c