diff options
| author | Paul Burton <paul.burton@imgtec.com> | 2014-07-11 16:44:27 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-04-04 22:21:52 +0100 |
| commit | f251957b9ff32af7fe610787988a1a1f09b7d32d (patch) | |
| tree | 5086cc5b4c3adf4100c2b78eb8632bbaab7bc148 /arch/mips/include | |
| parent | 5b9e032567e1a762bd86d1c7d4d6cf325b024c33 (diff) | |
| download | linux-stable-f251957b9ff32af7fe610787988a1a1f09b7d32d.tar.gz linux-stable-f251957b9ff32af7fe610787988a1a1f09b7d32d.tar.bz2 linux-stable-f251957b9ff32af7fe610787988a1a1f09b7d32d.zip | |
MIPS: allow msa.h to be included in assembly files
commit 558155a0a731b4f56846559a57ca7ca921230497 upstream.
Just #ifdef away the C functions when included from an assembly file,
as will be done in a following commit.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/7299/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch/mips/include')
| -rw-r--r-- | arch/mips/include/asm/msa.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/arch/mips/include/asm/msa.h b/arch/mips/include/asm/msa.h index d2227285383f..ab3fea101a7f 100644 --- a/arch/mips/include/asm/msa.h +++ b/arch/mips/include/asm/msa.h @@ -12,6 +12,8 @@ #include <asm/mipsregs.h> +#ifndef __ASSEMBLY__ + extern void _save_msa(struct task_struct *); extern void _restore_msa(struct task_struct *); @@ -133,15 +135,6 @@ static inline void write_msa_##name(unsigned int val) \ #endif /* !TOOLCHAIN_SUPPORTS_MSA */ -#define MSA_IR 0 -#define MSA_CSR 1 -#define MSA_ACCESS 2 -#define MSA_SAVE 3 -#define MSA_MODIFY 4 -#define MSA_REQUEST 5 -#define MSA_MAP 6 -#define MSA_UNMAP 7 - __BUILD_MSA_CTL_REG(ir, 0) __BUILD_MSA_CTL_REG(csr, 1) __BUILD_MSA_CTL_REG(access, 2) @@ -151,6 +144,17 @@ __BUILD_MSA_CTL_REG(request, 5) __BUILD_MSA_CTL_REG(map, 6) __BUILD_MSA_CTL_REG(unmap, 7) +#endif /* !__ASSEMBLY__ */ + +#define MSA_IR 0 +#define MSA_CSR 1 +#define MSA_ACCESS 2 +#define MSA_SAVE 3 +#define MSA_MODIFY 4 +#define MSA_REQUEST 5 +#define MSA_MAP 6 +#define MSA_UNMAP 7 + /* MSA Implementation Register (MSAIR) */ #define MSA_IR_REVB 0 #define MSA_IR_REVF (_ULCAST_(0xff) << MSA_IR_REVB) |