diff options
| author |   Mark Rutland <mark.rutland@arm.com> | 2021-05-25 15:02:01 +0100 |
|---|---|---|
| committer |   Peter Zijlstra <peterz@infradead.org> | 2021-05-26 13:20:49 +0200 |
| commit | 201e2c1bbe659720913ed5272a2c44e6ab646c8a (patch) | |
| tree | 7f884d88ba2bea8200b642c42ec72f4ce569f429 /net/core | |
| parent | locking/atomic: make ARCH_ATOMIC a Kconfig symbol (diff) | |
| download | linux-dev-201e2c1bbe659720913ed5272a2c44e6ab646c8a.tar.xz linux-dev-201e2c1bbe659720913ed5272a2c44e6ab646c8a.zip | |
locking/atomic: net: use linux/atomic.h for xchg & cmpxchg
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>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210525140232.53872-3-mark.rutland@arm.com
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/filter.c | 2 |
1 files changed, 1 insertions, 1 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> |