Commit 002dff36 authored by Will Deacon's avatar Will Deacon

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: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 3c918410
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/barrier.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/vdso/cp15.h> #include <asm/vdso/cp15.h>
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/barrier.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/errno.h> #include <asm/errno.h>
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/barrier.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#define VDSO_HAS_CLOCK_GETRES 1 #define VDSO_HAS_CLOCK_GETRES 1
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/barrier.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/csr.h> #include <asm/csr.h>
#include <uapi/linux/time.h> #include <uapi/linux/time.h>
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#include <linux/kasan-checks.h> #include <linux/kasan-checks.h>
#include <linux/kcsan-checks.h> #include <linux/kcsan-checks.h>
#include <asm/barrier.h>
/* /*
* Yes, this permits 64-bit accesses on 32-bit architectures. These will * 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 * actually be atomic in some cases (namely Armv7 + LPAE), but for others we
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
#ifndef _LINUX_NOSPEC_H #ifndef _LINUX_NOSPEC_H
#define _LINUX_NOSPEC_H #define _LINUX_NOSPEC_H
#include <linux/compiler.h>
#include <asm/barrier.h> #include <asm/barrier.h>
struct task_struct; struct task_struct;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment