Skip to content

Commit fa62f39

Browse files
committed
MIPS: Fix build error due to PTR used in more places
Use PTR_WD instead of PTR to avoid clashes with other parts. Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
1 parent e783362 commit fa62f39

18 files changed

+185
-185
lines changed

arch/mips/include/asm/asm.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ symbol = value
285285

286286
#define PTR_SCALESHIFT 2
287287

288-
#define PTR .word
288+
#define PTR_WD .word
289289
#define PTRSIZE 4
290290
#define PTRLOG 2
291291
#endif
@@ -310,7 +310,7 @@ symbol = value
310310

311311
#define PTR_SCALESHIFT 3
312312

313-
#define PTR .dword
313+
#define PTR_WD .dword
314314
#define PTRSIZE 8
315315
#define PTRLOG 3
316316
#endif

arch/mips/include/asm/ftrace.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ do { \
3232
".previous\n" \
3333
\
3434
".section\t__ex_table,\"a\"\n\t" \
35-
STR(PTR) "\t1b, 3b\n\t" \
35+
STR(PTR_WD) "\t1b, 3b\n\t" \
3636
".previous\n" \
3737
\
3838
: [tmp_dst] "=&r" (dst), [tmp_err] "=r" (error)\
@@ -54,7 +54,7 @@ do { \
5454
".previous\n" \
5555
\
5656
".section\t__ex_table,\"a\"\n\t"\
57-
STR(PTR) "\t1b, 3b\n\t" \
57+
STR(PTR_WD) "\t1b, 3b\n\t" \
5858
".previous\n" \
5959
\
6060
: [tmp_err] "=r" (error) \

arch/mips/include/asm/r4kcache.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ static inline void flush_scache_line(unsigned long addr)
119119
" j 2b \n" \
120120
" .previous \n" \
121121
" .section __ex_table,\"a\" \n" \
122-
" "STR(PTR)" 1b, 3b \n" \
122+
" "STR(PTR_WD)" 1b, 3b \n" \
123123
" .previous" \
124124
: "+r" (__err) \
125125
: "i" (op), "r" (addr), "i" (-EFAULT)); \
@@ -142,7 +142,7 @@ static inline void flush_scache_line(unsigned long addr)
142142
" j 2b \n" \
143143
" .previous \n" \
144144
" .section __ex_table,\"a\" \n" \
145-
" "STR(PTR)" 1b, 3b \n" \
145+
" "STR(PTR_WD)" 1b, 3b \n" \
146146
" .previous" \
147147
: "+r" (__err) \
148148
: "i" (op), "r" (addr), "i" (-EFAULT)); \

0 commit comments

Comments
 (0)