Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+6 -2
+1
arch/arm/include/asm/vdso/gettimeofday.h
··· 7 7 8 8 #ifndef __ASSEMBLY__ 9 9 10 + #include <asm/barrier.h> 10 11 #include <asm/errno.h> 11 12 #include <asm/unistd.h> 12 13 #include <asm/vdso/cp15.h>
+1
arch/arm64/include/asm/vdso/compat_gettimeofday.h
··· 7 7 8 8 #ifndef __ASSEMBLY__ 9 9 10 + #include <asm/barrier.h> 10 11 #include <asm/unistd.h> 11 12 #include <asm/errno.h> 12 13
+1
arch/arm64/include/asm/vdso/gettimeofday.h
··· 7 7 8 8 #ifndef __ASSEMBLY__ 9 9 10 + #include <asm/barrier.h> 10 11 #include <asm/unistd.h> 11 12 12 13 #define VDSO_HAS_CLOCK_GETRES 1
+1
arch/riscv/include/asm/vdso/gettimeofday.h
··· 4 4 5 5 #ifndef __ASSEMBLY__ 6 6 7 + #include <asm/barrier.h> 7 8 #include <asm/unistd.h> 8 9 #include <asm/csr.h> 9 10 #include <uapi/linux/time.h>
-2
include/asm-generic/rwonce.h
··· 26 26 #include <linux/kasan-checks.h> 27 27 #include <linux/kcsan-checks.h> 28 28 29 - #include <asm/barrier.h> 30 - 31 29 /* 32 30 * Yes, this permits 64-bit accesses on 32-bit architectures. These will 33 31 * actually be atomic in some cases (namely Armv7 + LPAE), but for others we
+2
include/linux/nospec.h
··· 5 5 6 6 #ifndef _LINUX_NOSPEC_H 7 7 #define _LINUX_NOSPEC_H 8 + 9 + #include <linux/compiler.h> 8 10 #include <asm/barrier.h> 9 11 10 12 struct task_struct;