summaryrefslogtreecommitdiffstats
path: root/include/linux/compiler.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2020-05-08 14:58:28 +0200
committerThomas Gleixner <tglx@linutronix.de>2020-05-08 14:58:28 +0200
commit97a9474aeb789183a1d0712e66a4283860279ac9 (patch)
tree4cd94285ef4a8e81c8d2e28f7dc9923cb60014e4 /include/linux/compiler.h
parent3b02a051d25d9600e9d403ad3043aed7de00160e (diff)
parent50a19ad4b1ec531eb550183cb5d4ab9f25a56bf8 (diff)
downloadlinux-97a9474aeb789183a1d0712e66a4283860279ac9.tar.gz
linux-97a9474aeb789183a1d0712e66a4283860279ac9.tar.bz2
linux-97a9474aeb789183a1d0712e66a4283860279ac9.zip
Merge branch 'kcsan-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into locking/kcsan
Pull KCSAN updates from Paul McKenney.
Diffstat (limited to 'include/linux/compiler.h')
-rw-r--r--include/linux/compiler.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 491c0a2128b7..cce2c92567b5 100644
--- 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