diff options
| author | Kees Cook <keescook@chromium.org> | 2021-08-18 06:18:09 +0300 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2021-08-30 11:18:24 +0300 |
| commit | 7f2dcc7371c1ab6e5d3678a7eff1cb0eb9725de9 (patch) | |
| tree | 5bef4be99ef42d9c7c7f9655ec077df71cced668 /arch/parisc/math-emu/decode_exc.c | |
| parent | 55b70eed81cba1331773d4aaf5cba2bb07475cd8 (diff) | |
| download | linux-7f2dcc7371c1ab6e5d3678a7eff1cb0eb9725de9.tar.xz | |
parisc: math-emu: Avoid "fmt" macro collision
The printk "fmt" macro was colliding. Rename like the others with a
"bits" suffix. Fixes a build failure:
arch/parisc/math-emu/decode_exc.c: In function 'decode_fpu':
arch/parisc/math-emu/decode_exc.c:49:14: error: expected identifier before numeric constant
49 | #define fmt 11 /* bits 19 & 20 */
| ^~
./include/linux/printk.h:379:6: note: in expansion of macro 'fmt'
379 | .fmt = __builtin_constant_p(_fmt) ? (_fmt) : NULL, \
| ^~~
./include/linux/printk.h:417:3: note: in expansion of macro '__printk_index_emit'
417 | __printk_index_emit(_fmt, NULL, NULL); \
| ^~~~~~~~~~~~~~~~~~~
./include/linux/printk.h:446:26: note: in expansion of macro 'printk_index_wrap'
446 | #define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__)
| ^~~~~~~~~~~~~~~~~
arch/parisc/math-emu/decode_exc.c:339:3: note: in expansion of macro 'printk'
339 | printk("%s(%d) Unknown FPU exception 0x%x\n", __FILE__,
| ^~~~~~
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-parisc@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'arch/parisc/math-emu/decode_exc.c')
| -rw-r--r-- | arch/parisc/math-emu/decode_exc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/math-emu/decode_exc.c b/arch/parisc/math-emu/decode_exc.c index cd8ffc6ceadf..494ca41df05d 100644 --- a/arch/parisc/math-emu/decode_exc.c +++ b/arch/parisc/math-emu/decode_exc.c @@ -46,7 +46,7 @@ #define SIGNALCODE(signal, code) ((signal) << 24 | (code)) #define copropbit 1<<31-2 /* bit position 2 */ #define opclass 9 /* bits 21 & 22 */ -#define fmt 11 /* bits 19 & 20 */ +#define fmtbits 11 /* bits 19 & 20 */ #define df 13 /* bits 17 & 18 */ #define twobits 3 /* mask low-order 2 bits */ #define fivebits 31 /* mask low-order 5 bits */ @@ -57,7 +57,7 @@ #define Excp_instr(index) Instructionfield(Fpu_register[index]) #define Clear_excp_register(index) Allexception(Fpu_register[index]) = 0 #define Excp_format() \ - (current_ir >> ((current_ir>>opclass & twobits)==1 ? df : fmt) & twobits) + (current_ir >> ((current_ir>>opclass & twobits) == 1 ? df : fmtbits) & twobits) /* Miscellaneous definitions */ #define Fpu_sgl(index) Fpu_register[index*2] |