Commit 6b76d624 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch 'kvm-arm64/misc-5.12' into kvmarm-master/next 



Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 5e6b2111 bbc075e0

arch/arm64/kvm/hyp/nvhe/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -3,8 +3,8 @@ 
# Makefile for Kernel-based Virtual Machine module, HYP/nVHE part

# Makefile for Kernel-based Virtual Machine module, HYP/nVHE part

#

#





asflags-y := -D__KVM_NVHE_HYPERVISOR__

asflags-y := -D__KVM_NVHE_HYPERVISOR__ -D__DISABLE_EXPORTS

ccflags-y := -D__KVM_NVHE_HYPERVISOR__

ccflags-y := -D__KVM_NVHE_HYPERVISOR__ -D__DISABLE_EXPORTS





obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o host.o \

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

	 hyp-main.o hyp-smp.o psci-relay.o

arch/arm64/kvm/hyp/nvhe/hyp-init.S

+4 −11
Original line number Original line Diff line number Diff line
@@ -55,17 +55,10 @@ __do_hyp_init: 
	cmp	x0, #HVC_STUB_HCALL_NR

	cmp	x0, #HVC_STUB_HCALL_NR

	b.lo	__kvm_handle_stub_hvc

	b.lo	__kvm_handle_stub_hvc





	// We only actively check bits [24:31], and everything

	mov	x3, #KVM_HOST_SMCCC_FUNC(__kvm_hyp_init)

	// else has to be zero, which we check at build time.

	cmp	x0, x3

#if (KVM_HOST_SMCCC_FUNC(__kvm_hyp_init) & 0xFFFFFFFF00FFFFFF)

	b.eq	1f

#error Unexpected __KVM_HOST_SMCCC_FUNC___kvm_hyp_init value



#endif



	ror	x0, x0, #24

	eor	x0, x0, #((KVM_HOST_SMCCC_FUNC(__kvm_hyp_init) >> 24) & 0xF)

	ror	x0, x0, #4

	eor	x0, x0, #((KVM_HOST_SMCCC_FUNC(__kvm_hyp_init) >> 28) & 0xF)

	cbz	x0, 1f

	mov	x0, #SMCCC_RET_NOT_SUPPORTED

	mov	x0, #SMCCC_RET_NOT_SUPPORTED

	eret

	eret

include/asm-generic/export.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ 
 */

 */





.macro ___EXPORT_SYMBOL name,val,sec

.macro ___EXPORT_SYMBOL name,val,sec

#ifdef CONFIG_MODULES

#if defined(CONFIG_MODULES) && !defined(__DISABLE_EXPORTS)

	.section ___ksymtab\sec+\name,"a"

	.section ___ksymtab\sec+\name,"a"

	.balign KSYM_ALIGN

	.balign KSYM_ALIGN

__ksymtab_\name:

__ksymtab_\name: