It appears that compilers have trouble with nested statement expressions. Therefore remove one level of statement expression nesting from the data_race() macro. This will help us avoid potential problems in future as its usage increases.
Link: https://lkml.kernel.org/r/[email protected] Acked-by: Will Deacon <[email protected]> Signed-off-by: Marco Elver <[email protected]> --- v3: * Fix for 'const' non-scalar expressions. v2: * Add patch to series in response to above linked discussion. --- include/linux/compiler.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 7444f026eead..379a5077e9c6 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -211,12 +211,12 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, */ #define data_race(expr) \ ({ \ - __kcsan_disable_current(); \ - ({ \ - __unqual_scalar_typeof(({ expr; })) __v = ({ expr; }); \ - __kcsan_enable_current(); \ - __v; \ + __unqual_scalar_typeof(({ expr; })) __v = ({ \ + __kcsan_disable_current(); \ + expr; \ }); \ + __kcsan_enable_current(); \ + __v; \ }) /* -- 2.26.2.761.g0e0b3e54be-goog
