D41141.diff
No OneTemporary
Actions

Size

1020 B

Referenced Files

None

Subscribers

None

D41141.diff
View Options

	diff --git a/sys/arm/arm/cpufunc_asm.S b/sys/arm/arm/cpufunc_asm.S
	--- a/sys/arm/arm/cpufunc_asm.S
	+++ b/sys/arm/arm/cpufunc_asm.S
	@@ -45,6 +45,8 @@
	#include <machine/asm.h>
	__FBSDID("$FreeBSD$");

	+#include <machine/sysreg.h>
	+
	.text
	.align 2

	diff --git a/sys/arm/arm/hypervisor-stub.S b/sys/arm/arm/hypervisor-stub.S
	--- a/sys/arm/arm/hypervisor-stub.S
	+++ b/sys/arm/arm/hypervisor-stub.S
	@@ -29,6 +29,7 @@
	#include <machine/asm.h>
	#include <machine/asmacros.h>
	#include <machine/armreg.h>
	+#include <machine/sysreg.h>

	__FBSDID("$FreeBSD$");

	diff --git a/sys/arm/include/asm.h b/sys/arm/include/asm.h
	--- a/sys/arm/include/asm.h
	+++ b/sys/arm/include/asm.h
	@@ -41,7 +41,6 @@
	#ifndef _MACHINE_ASM_H_
	#define _MACHINE_ASM_H_
	#include <sys/cdefs.h>
	-#include <machine/sysreg.h>

	#define _C_LABEL(x) x
	#define _ASM_LABEL(x) x
	@@ -194,6 +193,7 @@
	#endif

	#elif __ARM_ARCH == 6
	+#include <machine/sysreg.h>
	#define ISB mcr CP15_CP15ISB
	#define DSB mcr CP15_CP15DSB
	#define DMB mcr CP15_CP15DMB