diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2020-05-08 14:58:28 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-05-08 14:58:28 +0200 |
| commit | 97a9474aeb789183a1d0712e66a4283860279ac9 (patch) | |
| tree | 4cd94285ef4a8e81c8d2e28f7dc9923cb60014e4 /include/linux/compiler.h | |
| parent | Merge tag 'v5.7-rc1' into locking/kcsan, to resolve conflicts and refresh (diff) | |
| parent | objtool, kcsan: Add kcsan_disable_current() and kcsan_enable_current_nowarn() (diff) | |
| download | linux-dev-97a9474aeb789183a1d0712e66a4283860279ac9.tar.xz linux-dev-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.h | 4 |
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 |