From d55975b74389b2cf1a38732062ff89303940f6e1 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sat, 29 Jun 2013 11:46:56 +0200 Subject: [PATCH 01/10] MIPS: bmips: fix compilation for BMIPS5000 Replace the macro names in strings with actual macro invocation. Fixes the following build error: CC arch/mips/kernel/smp-bmips.o {standard input}: Assembler messages: {standard input}:951: Error: Unrecognized opcode `_ssnop' {standard input}:952: Error: Unrecognized opcode `_ssnop' (...) make[6]: *** [arch/mips/kernel/smp-bmips.o] Error 1 Signed-off-by: Jonas Gorski --- arch/mips/include/asm/bmips.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) --- a/arch/mips/include/asm/bmips.h +++ b/arch/mips/include/asm/bmips.h @@ -97,15 +97,15 @@ static inline unsigned long bmips_read_z ".set noreorder\n" "cache %1, 0(%2)\n" "sync\n" - "_ssnop\n" - "_ssnop\n" - "_ssnop\n" - "_ssnop\n" - "_ssnop\n" - "_ssnop\n" - "_ssnop\n" + __stringify(___ssnop) "\n" + __stringify(___ssnop) "\n" + __stringify(___ssnop) "\n" + __stringify(___ssnop) "\n" + __stringify(___ssnop) "\n" + __stringify(___ssnop) "\n" + __stringify(___ssnop) "\n" "mfc0 %0, $28, 3\n" - "_ssnop\n" + __stringify(___ssnop) "\n" ".set pop\n" : "=&r" (ret) : "i" (Index_Load_Tag_S), "r" (ZSCM_REG_BASE + offset) @@ -119,13 +119,13 @@ static inline void bmips_write_zscm_reg( ".set push\n" ".set noreorder\n" "mtc0 %0, $28, 3\n" - "_ssnop\n" - "_ssnop\n" - "_ssnop\n" + __stringify(___ssnop) "\n" + __stringify(___ssnop) "\n" + __stringify(___ssnop) "\n" "cache %1, 0(%2)\n" - "_ssnop\n" - "_ssnop\n" - "_ssnop\n" + __stringify(___ssnop) "\n" + __stringify(___ssnop) "\n" + __stringify(___ssnop) "\n" : /* no outputs */ : "r" (data), "i" (Index_Store_Tag_S), "r" (ZSCM_REG_BASE + offset)