* [PATCH] parisc: math-emu: Avoid "fmt" macro collision
@ 2021-08-18 3:18 Kees Cook
0 siblings, 0 replies; only message in thread
From: Kees Cook @ 2021-08-18 3:18 UTC (permalink / raw)
To: James E.J. Bottomley
Cc: Kees Cook, Helge Deller, linux-parisc, linux-kernel, linux-hardening
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>
---
arch/parisc/math-emu/decode_exc.c | 4 ++--
1 file 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]
--
2.30.2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-08-18 3:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-18 3:18 [PATCH] parisc: math-emu: Avoid "fmt" macro collision Kees Cook
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.