diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-08-01 10:25:21 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-08-01 10:26:27 +0300 |
| commit | 63722bbca662b19eb39fe709c11a5fa3994b4c3f (patch) | |
| tree | 845060d13c90891cb89f18e29c40cf6dfdebe850 /arch/x86/mm | |
| parent | 28cff52eaeb5c43144d0c730080aff0d6bc1e5d5 (diff) | |
| parent | 61d56d7aa5eca3b909bce51ba8125b0fa44d7e17 (diff) | |
| download | linux-63722bbca662b19eb39fe709c11a5fa3994b4c3f.tar.xz | |
Merge branch 'kcsan' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into locking/core
Pull v5.9 KCSAN bits from Paul E. McKenney.
Perhaps the most important change is that GCC 11 now has all fixes in place
to support KCSAN, so GCC support can be enabled again.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/pat/set_memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index 77e04304a2a7..d1b2a889f035 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -135,7 +135,7 @@ static inline void cpa_inc_2m_checked(void) static inline void cpa_inc_4k_install(void) { - cpa_4k_install++; + data_race(cpa_4k_install++); } static inline void cpa_inc_lp_sameprot(int level) |