The following commit has been merged into the locking/kcsan branch of tip: Commit-ID: b968a08f242d51982e46041c506115b5e11a7570 Gitweb: https://git.kernel.org/tip/b968a08f242d51982e46041c506115b5e11a7570 Author: Marco Elver <elver@xxxxxxxxxx> AuthorDate: Tue, 11 Feb 2020 17:04:20 +01:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Sat, 21 Mar 2020 09:43:57 +01:00 compiler.h, seqlock.h: Remove unnecessary kcsan.h includes No we longer have to include kcsan.h, since the required KCSAN interface for both compiler.h and seqlock.h are now provided by kcsan-checks.h. Acked-by: John Hubbard <jhubbard@xxxxxxxxxx> Signed-off-by: Marco Elver <elver@xxxxxxxxxx> Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- include/linux/compiler.h | 2 -- include/linux/seqlock.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/linux/compiler.h b/include/linux/compiler.h index c1bdf37..f504ede 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -313,8 +313,6 @@ unsigned long read_word_at_a_time(const void *addr) __u.__val; \ }) -#include <linux/kcsan.h> - /** * data_race - mark an expression as containing intentional data races * diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h index 239701c..8b97204 100644 --- a/include/linux/seqlock.h +++ b/include/linux/seqlock.h @@ -37,7 +37,7 @@ #include <linux/preempt.h> #include <linux/lockdep.h> #include <linux/compiler.h> -#include <linux/kcsan.h> +#include <linux/kcsan-checks.h> #include <asm/processor.h> /*
|