summaryrefslogtreecommitdiff
path: root/include/asm-generic
diff options
context:
space:
mode:
authorWill Deacon <will@kernel.org>2020-07-10 14:49:40 +0100
committerWill Deacon <will@kernel.org>2020-07-21 10:50:36 +0100
commit002dff36acfba3476b685a09f78ffb7c452f5951 (patch)
tree7d09b29aed61f6f3ff760a1c6a6767270f0489df /include/asm-generic
parent3c9184109e78ea2371ca8fa66d7f36986a53af98 (diff)
asm/rwonce: Don't pull <asm/barrier.h> into 'asm-generic/rwonce.h'
Now that 'smp_read_barrier_depends()' has gone the way of the Norwegian Blue, drop the inclusion of <asm/barrier.h> in 'asm-generic/rwonce.h'. This requires fixups to some architecture vdso headers which were previously relying on 'asm/barrier.h' coming in via 'linux/compiler.h'. Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/rwonce.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-generic/rwonce.h b/include/asm-generic/rwonce.h
index 3a7f737c77bd..8d0a6280e982 100644
--- a/include/asm-generic/rwonce.h
+++ b/include/asm-generic/rwonce.h
@@ -26,8 +26,6 @@
#include <linux/kasan-checks.h>
#include <linux/kcsan-checks.h>
-#include <asm/barrier.h>
-
/*
* Yes, this permits 64-bit accesses on 32-bit architectures. These will
* actually be atomic in some cases (namely Armv7 + LPAE), but for others we