aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorAndrew Turner <andrew@FreeBSD.org>2024-05-03 16:07:29 +0000
committerAndrew Turner <andrew@FreeBSD.org>2024-05-10 09:29:24 +0000
commite353ac0cfd5d155c01253ee17c2bf23f888cb7de (patch)
tree3226d11f694ccbcbfc45da7595c5b03eac53ec1a /sys
parent44e72c6e2e6bcfa2cba89afb92fa05f6ac4d5660 (diff)
downloadsrc-e353ac0cfd5d155c01253ee17c2bf23f888cb7de.tar.gz
src-e353ac0cfd5d155c01253ee17c2bf23f888cb7de.zip
am64: Allow cpu.h to be included from assembly
Reviewed by: jhibbits, kevans Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45081
Diffstat (limited to 'sys')
-rw-r--r--sys/arm64/include/cpu.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h
index 8f5a9e3dbd3c..91ed3634c6d8 100644
--- a/sys/arm64/include/cpu.h
+++ b/sys/arm64/include/cpu.h
@@ -42,8 +42,10 @@
#ifndef _MACHINE_CPU_H_
#define _MACHINE_CPU_H_
+#if !defined(__ASSEMBLER__)
#include <machine/atomic.h>
#include <machine/frame.h>
+#endif
#include <machine/armreg.h>
#define TRAPF_PC(tfp) ((tfp)->tf_elr)
@@ -198,6 +200,7 @@
#define CPU_MATCH_ERRATA_CAVIUM_THUNDERX_1_1 0
#endif
+#if !defined(__ASSEMBLER__)
extern char btext[];
extern char etext[];
@@ -268,6 +271,7 @@ ADDRESS_TRANSLATE_FUNC(s1e0w)
ADDRESS_TRANSLATE_FUNC(s1e1r)
ADDRESS_TRANSLATE_FUNC(s1e1w)
+#endif /* !__ASSEMBLER__ */
#endif
#endif /* !_MACHINE_CPU_H_ */