From 97e795ccca4c04db62765366f33143840815cf5c Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Thu, 20 Aug 2020 07:21:55 +0200 Subject: [PATCH] mips: octeon: octeon-model.h: Enable inclusion from assembler files Add the #ifdef __ASSEMBLY__ checks to enable inclusion of this header from assembler files. Signed-off-by: Stefan Roese --- arch/mips/mach-octeon/include/mach/octeon-model.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/mips/mach-octeon/include/mach/octeon-model.h b/arch/mips/mach-octeon/include/mach/octeon-model.h index a346b34..22d6df6 100644 --- a/arch/mips/mach-octeon/include/mach/octeon-model.h +++ b/arch/mips/mach-octeon/include/mach/octeon-model.h @@ -262,6 +262,8 @@ ))); \ }) +#ifndef __ASSEMBLY__ + #ifndef OCTEON_IS_MODEL static inline int __octeon_is_model_runtime_internal__(u32 model) @@ -310,4 +312,6 @@ static inline u32 cvmx_get_octeon_family(void) return (read_c0_prid() & OCTEON_FAMILY_MASK); } +#endif /* __ASSEMBLY__ */ + #endif /* __OCTEON_MODEL_H__ */ -- 2.7.4