diff options
| author | Will Deacon <will@kernel.org> | 2020-07-10 14:49:40 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-07-21 10:50:36 +0100 |
| commit | 002dff36acfba3476b685a09f78ffb7c452f5951 (patch) | |
| tree | 7d09b29aed61f6f3ff760a1c6a6767270f0489df /arch/arm64/include/asm/vdso | |
| parent | 3c9184109e78ea2371ca8fa66d7f36986a53af98 (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 'arch/arm64/include/asm/vdso')
| -rw-r--r-- | arch/arm64/include/asm/vdso/compat_gettimeofday.h | 1 | ||||
| -rw-r--r-- | arch/arm64/include/asm/vdso/gettimeofday.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/vdso/compat_gettimeofday.h b/arch/arm64/include/asm/vdso/compat_gettimeofday.h index b6907ae78e53..bcf7649999a4 100644 --- a/arch/arm64/include/asm/vdso/compat_gettimeofday.h +++ b/arch/arm64/include/asm/vdso/compat_gettimeofday.h @@ -7,6 +7,7 @@ #ifndef __ASSEMBLY__ +#include <asm/barrier.h> #include <asm/unistd.h> #include <asm/errno.h> diff --git a/arch/arm64/include/asm/vdso/gettimeofday.h b/arch/arm64/include/asm/vdso/gettimeofday.h index afba6ba332f8..127fa63893e2 100644 --- a/arch/arm64/include/asm/vdso/gettimeofday.h +++ b/arch/arm64/include/asm/vdso/gettimeofday.h @@ -7,6 +7,7 @@ #ifndef __ASSEMBLY__ +#include <asm/barrier.h> #include <asm/unistd.h> #define VDSO_HAS_CLOCK_GETRES 1 |