lkml.org 
[lkml]   [2022]   [Jul]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] um: remove stray ) in macro expression
Date
A commit erroneously added a stray ), causing compile errors:

In file included from /home/zx2c4/Projects/wireguard-linux/crypto/xor.c:17:
/home/zx2c4/Projects/wireguard-linux/crypto/xor.c: In function ‘register_xor_blocks’:
/home/zx2c4/Projects/wireguard-linux/arch/um/include/asm/xor.h:21:74: error: expected ‘;’ before ‘)’ token
21 | (time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x))
| ^
/home/zx2c4/Projects/wireguard-linux/crypto/xor.c:66:27: note: in expansion of macro ‘XOR_SELECT_TEMPLATE’
66 | active_template = XOR_SELECT_TEMPLATE(NULL);
| ^~~~~~~~~~~~~~~~~~~
/home/zx2c4/Projects/wireguard-linux/arch/um/include/asm/xor.h:21:74: error: expected statement before ‘)’ token
21 | (time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x))
| ^
/home/zx2c4/Projects/wireguard-linux/crypto/xor.c:66:27: note: in expansion of macro ‘XOR_SELECT_TEMPLATE’
66 | active_template = XOR_SELECT_TEMPLATE(NULL);
| ^~~~~~~~~~~~~~~~~~~
/home/zx2c4/Projects/wireguard-linux/crypto/xor.c: In function ‘calibrate_xor_blocks’:
/home/zx2c4/Projects/wireguard-linux/arch/um/include/asm/xor.h:21:74: error: expected ‘;’ before ‘)’ token
21 | (time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x))
| ^
/home/zx2c4/Projects/wireguard-linux/crypto/xor.c:124:19: note: in expansion of macro ‘XOR_SELECT_TEMPLATE’
124 | fastest = XOR_SELECT_TEMPLATE(NULL);
| ^~~~~~~~~~~~~~~~~~~
/home/zx2c4/Projects/wireguard-linux/arch/um/include/asm/xor.h:21:74: error: expected statement before ‘)’ token
21 | (time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x))
| ^
/home/zx2c4/Projects/wireguard-linux/crypto/xor.c:124:19: note: in expansion of macro ‘XOR_SELECT_TEMPLATE’
124 | fastest = XOR_SELECT_TEMPLATE(NULL);
| ^~~~~~~~~~~~~~~~~~~
CC fs/namei.o
make[3]: *** [/home/zx2c4/Projects/wireguard-linux/scripts/Makefile.build:249: crypto/xor.o] Error 1
make[3]: *** Waiting for unfinished jobs....

Fixes: e3a33af812c6 ("um: fix and optimize xor select template for CONFIG64 and timetravel mode")
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
arch/um/include/asm/xor.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/um/include/asm/xor.h b/arch/um/include/asm/xor.h
index 22b39de73c24..647fae200c5d 100644
--- a/arch/um/include/asm/xor.h
+++ b/arch/um/include/asm/xor.h
@@ -18,7 +18,7 @@
#undef XOR_SELECT_TEMPLATE
/* pick an arbitrary one - measuring isn't possible with inf-cpu */
#define XOR_SELECT_TEMPLATE(x) \
- (time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x))
+ (time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x)
#endif

#endif
--
2.35.1
\
 
 \ /
  Last update: 2022-07-13 15:58    [W:0.031 / U:1.792 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site