Commit da706e50 authored by Huacai Chen's avatar Huacai Chen Committed by Thomas Bogendoerfer

MIPS: asm: Rename some macros to avoid build errors

Use ASM_ prefix to rename some macros (PANIC and PRINT), in order to
avoid build errors (all users are updated as well):

1, PANIC conflicts with drivers/scsi/smartpqi/smartpqi_init.c
2, PRINT conflicts with net/netfilter/nf_conntrack_h323_asn1.c and net/
   mac80211/debugfs_sta.c

Fixes: d339cd02 ("MIPS: Move unaligned load/store helpers to inst.h")
Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarHuacai Chen <chenhc@lemote.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 109111b3
...@@ -304,8 +304,8 @@ spurious: ...@@ -304,8 +304,8 @@ spurious:
*/ */
FEXPORT(dec_intr_unimplemented) FEXPORT(dec_intr_unimplemented)
move a1,t0 # cheats way of printing an arg! move a1,t0 # cheats way of printing an arg!
PANIC("Unimplemented cpu interrupt! CP0_CAUSE: 0x%08x"); ASM_PANIC("Unimplemented cpu interrupt! CP0_CAUSE: 0x%08x");
FEXPORT(asic_intr_unimplemented) FEXPORT(asic_intr_unimplemented)
move a1,t0 # cheats way of printing an arg! move a1,t0 # cheats way of printing an arg!
PANIC("Unimplemented asic interrupt! ASIC ISR: 0x%08x"); ASM_PANIC("Unimplemented asic interrupt! ASIC ISR: 0x%08x");
...@@ -74,10 +74,15 @@ symbol: .insn ...@@ -74,10 +74,15 @@ symbol: .insn
.globl symbol; \ .globl symbol; \
symbol = value symbol = value
#define PANIC(msg) \ #define TEXT(msg) \
.pushsection .data; \
8: .asciiz msg; \
.popsection;
#define ASM_PANIC(msg) \
.set push; \ .set push; \
.set reorder; \ .set reorder; \
PTR_LA a0, 8f; \ PTR_LA a0, 8f; \
jal panic; \ jal panic; \
9: b 9b; \ 9: b 9b; \
.set pop; \ .set pop; \
...@@ -87,22 +92,17 @@ symbol = value ...@@ -87,22 +92,17 @@ symbol = value
* Print formatted string * Print formatted string
*/ */
#ifdef CONFIG_PRINTK #ifdef CONFIG_PRINTK
#define PRINT(string) \ #define ASM_PRINT(string) \
.set push; \ .set push; \
.set reorder; \ .set reorder; \
PTR_LA a0, 8f; \ PTR_LA a0, 8f; \
jal printk; \ jal printk; \
.set pop; \ .set pop; \
TEXT(string) TEXT(string)
#else #else
#define PRINT(string) #define ASM_PRINT(string)
#endif #endif
#define TEXT(msg) \
.pushsection .data; \
8: .asciiz msg; \
.popsection;
/* /*
* Stack alignment * Stack alignment
*/ */
......
...@@ -501,17 +501,17 @@ NESTED(nmi_handler, PT_SIZE, sp) ...@@ -501,17 +501,17 @@ NESTED(nmi_handler, PT_SIZE, sp)
.macro __BUILD_silent exception .macro __BUILD_silent exception
.endm .endm
/* Gas tries to parse the PRINT argument as a string containing /* Gas tries to parse the ASM_PRINT argument as a string containing
string escapes and emits bogus warnings if it believes to string escapes and emits bogus warnings if it believes to
recognize an unknown escape code. So make the arguments recognize an unknown escape code. So make the arguments
start with an n and gas will believe \n is ok ... */ start with an n and gas will believe \n is ok ... */
.macro __BUILD_verbose nexception .macro __BUILD_verbose nexception
LONG_L a1, PT_EPC(sp) LONG_L a1, PT_EPC(sp)
#ifdef CONFIG_32BIT #ifdef CONFIG_32BIT
PRINT("Got \nexception at %08lx\012") ASM_PRINT("Got \nexception at %08lx\012")
#endif #endif
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
PRINT("Got \nexception at %016lx\012") ASM_PRINT("Got \nexception at %016lx\012")
#endif #endif
.endm .endm
......
...@@ -41,7 +41,7 @@ NESTED(handle_sys, PT_SIZE, sp) ...@@ -41,7 +41,7 @@ NESTED(handle_sys, PT_SIZE, sp)
#if 0 #if 0
SAVE_ALL SAVE_ALL
move a1, v0 move a1, v0
PRINT("Scall %ld\n") ASM_PRINT("Scall %ld\n")
RESTORE_ALL RESTORE_ALL
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment