Merge branch 'kcsan-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck...

[platform/kernel/linux-starfive.git] / include / linux / compiler.h

diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 491c0a2..cce2c92 100644 (file)
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -326,9 +326,9 @@ unsigned long read_word_at_a_time(const void *addr)
 #define data_race(expr)                                                        \
        ({                                                                     \
                typeof(({ expr; })) __val;                                     \
-               kcsan_nestable_atomic_begin();                                 \
+               kcsan_disable_current();                                       \
                __val = ({ expr; });                                           \
-               kcsan_nestable_atomic_end();                                   \
+               kcsan_enable_current();                                        \
                __val;                                                         \
        })
 #else