Merge branch 'kvm-arm64/hyp-reloc' into kvmarm-master/next

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

diff --cc arch/arm64/kvm/arm.c
Simple merge

diff --cc arch/arm64/kvm/hyp/nvhe/Makefile
index c9c121c8d5deb81a68a8cf8e36672659f8b6fc09,ed10fcf1b3458aa80bc5cdb30699911baab9320d..a6707df4f6c0fc017c796e770d9ff5f05ded1f54
--- 1/arch/arm64/kvm/hyp/nvhe/Makefile
--- 2/arch/arm64/kvm/hyp/nvhe/Makefile
+++ b/arch/arm64/kvm/hyp/nvhe/Makefile
@@@ -3,9 -3,12 +3,12 @@@
  # Makefile for Kernel-based Virtual Machine module, HYP/nVHE part
  #
  
 -asflags-y := -D__KVM_NVHE_HYPERVISOR__
 -ccflags-y := -D__KVM_NVHE_HYPERVISOR__
 +asflags-y := -D__KVM_NVHE_HYPERVISOR__ -D__DISABLE_EXPORTS
 +ccflags-y := -D__KVM_NVHE_HYPERVISOR__ -D__DISABLE_EXPORTS
  
+ hostprogs := gen-hyprel
+ HOST_EXTRACFLAGS += -I$(objtree)/include
+ 
  obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o host.o \
         hyp-main.o hyp-smp.o psci-relay.o
  obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \

diff --cc arch/arm64/kvm/hyp/nvhe/hyp-init.S
Simple merge

diff --cc arch/arm64/kvm/hyp/nvhe/psci-relay.c
Simple merge