lkml.org 
[lkml]   [2021]   [May]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 02/33] locking/atomic: net: use linux/atomic.h for xchg & cmpxchg
    Date
    As xchg*() and cmpxchg*() may be instrumented by atomic-instrumented.h,
    it's necessary to include <linux/atomic.h> to use these, rather than
    <asm/cmpxchg.h>, which is effectively an arch-internal header.

    In a couple of places we include <asm/cmpxchg.h>, but get away with this
    as <linux/atomic.h> gets pulled in inidrectly by another include. Before
    we convert more architectures to use atomic-instrumented.h, let's fix
    these up to use <linux/atomic.h> so that we don't make things more
    fragile.

    Signed-off-by: Mark Rutland <mark.rutland@arm.com>
    Cc: Boqun Feng <boqun.feng@gmail.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Will Deacon <will@kernel.org>
    ---
    net/core/filter.c | 2 +-
    net/sunrpc/xprtmultipath.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/net/core/filter.c b/net/core/filter.c
    index cae56d08a670..ce4ae1a19a71 100644
    --- a/net/core/filter.c
    +++ b/net/core/filter.c
    @@ -17,6 +17,7 @@
    * Kris Katterjohn - Added many additional checks in bpf_check_classic()
    */

    +#include <linux/atomic.h>
    #include <linux/module.h>
    #include <linux/types.h>
    #include <linux/mm.h>
    @@ -41,7 +42,6 @@
    #include <linux/timer.h>
    #include <linux/uaccess.h>
    #include <asm/unaligned.h>
    -#include <asm/cmpxchg.h>
    #include <linux/filter.h>
    #include <linux/ratelimit.h>
    #include <linux/seccomp.h>
    diff --git a/net/sunrpc/xprtmultipath.c b/net/sunrpc/xprtmultipath.c
    index 78c075a68c04..1b4073131c6f 100644
    --- a/net/sunrpc/xprtmultipath.c
    +++ b/net/sunrpc/xprtmultipath.c
    @@ -7,13 +7,13 @@
    * Trond Myklebust <trond.myklebust@primarydata.com>
    *
    */
    +#include <linux/atomic.h>
    #include <linux/types.h>
    #include <linux/kref.h>
    #include <linux/list.h>
    #include <linux/rcupdate.h>
    #include <linux/rculist.h>
    #include <linux/slab.h>
    -#include <asm/cmpxchg.h>
    #include <linux/spinlock.h>
    #include <linux/sunrpc/xprt.h>
    #include <linux/sunrpc/addr.h>
    --
    2.11.0
    \
     
     \ /
      Last update: 2021-05-25 16:04    [W:4.044 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site