Merge branch kvm-arm64/misc-5.20 into kvmarm-master/next

Browse source

* kvm-arm64/misc-5.20:
  : .
  : Misc fixes for 5.20:
  :
  : - Tidy up the hyp/nvhe Makefile
  :
  : - Fix functions pointlessly returning a void value
  :
  : - Fix vgic_init selftest to handle the GICv3-on-v3 case
  :
  : - Fix hypervisor symbolisation when CONFIG_RANDOMIZE_BASE=y
  : .
  KVM: arm64: Fix hypervisor address symbolization
  KVM: arm64: selftests: Add support for GICv2 on v3
  KVM: arm64: Don't return from void function
  KVM: arm64: nvhe: Add intermediates to 'targets' instead of extra-y
  KVM: arm64: nvhe: Rename confusing obj-y

Signed-off-by: Marc Zyngier <maz@kernel.org>

...

This commit is contained in:

Marc Zyngier 2022-07-17 11:45:22 +01:00

parent dc94f89ae6 ed6313a93f

commit aeb7942b64

5 changed files with 18 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

arch/arm64/kvm/handle_exit.c

View file

12

arch/arm64/kvm/hyp/nvhe/Makefile

View file

2

arch/arm64/kvm/hyp/nvhe/switch.c

View file

2

arch/arm64/kvm/hyp/vhe/switch.c

View file

13

tools/testing/selftests/kvm/aarch64/vgic_init.c

View file