lkml.org 
[lkml]   [2020]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH kcsan 22/32] compiler.h, seqlock.h: Remove unnecessary kcsan.h includes
    Date
    From: Marco Elver <elver@google.com>

    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.

    Signed-off-by: Marco Elver <elver@google.com>
    Acked-by: John Hubbard <jhubbard@nvidia.com>
    Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
    ---
    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>

    /*
    --
    2.9.5
    \
     
     \ /
      Last update: 2020-03-09 20:05    [W:4.082 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site