D48715.1790735811.diff
No OneTemporary
Actions

Size

945 B

Referenced Files

None

Subscribers

None

D48715.1790735811.diff
View Options

	diff --git a/sys/arm64/arm64/efirt_support.S b/sys/arm64/arm64/efirt_support.S
	--- a/sys/arm64/arm64/efirt_support.S
	+++ b/sys/arm64/arm64/efirt_support.S
	@@ -85,7 +85,7 @@
	ret
	END(efi_rt_arch_call)

	-ENTRY(efi_rt_fault)
	+LENTRY(efi_rt_fault)
	/* Clear pcb_onfault */
	SET_FAULT_HANDLER(xzr, x11)
	/* Load curthread */
	@@ -96,6 +96,6 @@
	/* Normal exit returning an error */
	ldr x0, =EFAULT
	b .Lefi_rt_arch_call_exit
	-END(efi_rt_fault)
	+LEND(efi_rt_fault)

	GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL)
	diff --git a/sys/modules/efirt/Makefile b/sys/modules/efirt/Makefile
	--- a/sys/modules/efirt/Makefile
	+++ b/sys/modules/efirt/Makefile
	@@ -8,6 +8,9 @@

	.if ${MACHINE_CPUARCH} == "amd64"
	SRCS+= opt_hwpmc_hooks.h opt_kstack_pages.h
	+.endif
	+
	+.if ${MACHINE_CPUARCH} == "aarch64" \|\| ${MACHINE_CPUARCH} == "amd64"
	SRCS+= efirt_support.S
	DPSRCS+= assym.inc
	efirt_support.o: efirt_support.S assym.inc