diff options
| author | Andrew Turner <andrew@FreeBSD.org> | 2024-05-03 16:07:29 +0000 |
|---|---|---|
| committer | Andrew Turner <andrew@FreeBSD.org> | 2024-07-15 12:34:28 +0000 |
| commit | 23fd9f3e934bc933e12eb7dcf01bb503be9ba0b8 (patch) | |
| tree | 9f8b608eb28e2ae21734b80221d4c38b45bfce13 | |
| parent | 449ba445507ed45428a06f579de98e94f7257c23 (diff) | |
am64: Allow cpu.h to be included from assembly
Reviewed by: jhibbits, kevans
Sponsored by: Arm Ltd
Differential Revision: https://reviews.freebsd.org/D45081
(cherry picked from commit e353ac0cfd5d155c01253ee17c2bf23f888cb7de)
| -rw-r--r-- | sys/arm64/include/cpu.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h index ceccdf95ee8c..de6741fef1e0 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -40,8 +40,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) @@ -177,6 +179,7 @@ #define CPU_MATCH_ERRATA_CAVIUM_THUNDERX_1_1 0 #endif +#if !defined(__ASSEMBLER__) extern char btext[]; extern char etext[]; @@ -227,6 +230,7 @@ ADDRESS_TRANSLATE_FUNC(s1e0w) ADDRESS_TRANSLATE_FUNC(s1e1r) ADDRESS_TRANSLATE_FUNC(s1e1w) +#endif /* !__ASSEMBLER__ */ #endif #endif /* !_MACHINE_CPU_H_ */ |