Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

asm/rwonce: Don't pull <asm/barrier.h> into 'asm-generic/rwonce.h'

Browse Source 
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>
This commit is contained in:
Will Deacon 2020-07-10 14:49:40 +01:00
parent 3c9184109e
commit 002dff36ac
6 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/include/asm/vdso/gettimeofday.h
View File

@ -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>

1
arch/arm64/include/asm/vdso/compat_gettimeofday.h
View File

@ -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>

1
arch/arm64/include/asm/vdso/gettimeofday.h
View File

@ -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

1
arch/riscv/include/asm/vdso/gettimeofday.h
View File

@ -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>

2
include/asm-generic/rwonce.h
View File

@ -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

2
include/linux/nospec.h
View File

@ -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;