diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-31 19:18:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-31 19:18:12 -0800 |
| commit | 40b9672a2f071cbf931eb144997a21332bc0a747 (patch) | |
| tree | 9ca1d0e049e3163cec7d337e9d4458e7ab2c857f /arch | |
| parent | dc1efc3cfaf5e16870a9a7b1b903dcf6e3ef15e8 (diff) | |
| parent | c68070d0408eb2297331a9c9ae538a7bec13fc81 (diff) | |
Merge branch 'work.whack-a-mole' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull asm/uaccess.h whack-a-mole from Al Viro:
"It's linux/uaccess.h, damnit... Oh, well - eventually they'll stop
cropping up..."
* 'work.whack-a-mole' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
asm-prototypes.h: use linux/uaccess.h, not asm/uaccess.h
riscv: use linux/uaccess.h, not asm/uaccess.h...
ppc: for put_user() pull linux/uaccess.h, not asm/uaccess.h
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/alpha/include/asm/asm-prototypes.h | 2 | ||||
| -rw-r--r-- | arch/ia64/include/asm/asm-prototypes.h | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/asm-prototypes.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/kvm/book3s_xive.c | 2 | ||||
| -rw-r--r-- | arch/riscv/kernel/process.c | 2 | ||||
| -rw-r--r-- | arch/riscv/mm/fault.c | 1 | ||||
| -rw-r--r-- | arch/sparc/include/asm/asm-prototypes.h | 2 |
7 files changed, 6 insertions, 7 deletions
diff --git a/arch/alpha/include/asm/asm-prototypes.h b/arch/alpha/include/asm/asm-prototypes.h index d12c68ea340b..b34cc1f06720 100644 --- a/arch/alpha/include/asm/asm-prototypes.h +++ b/arch/alpha/include/asm/asm-prototypes.h @@ -4,7 +4,7 @@ #include <asm/console.h> #include <asm/page.h> #include <asm/string.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm-generic/asm-prototypes.h> diff --git a/arch/ia64/include/asm/asm-prototypes.h b/arch/ia64/include/asm/asm-prototypes.h index c711536674e3..a96689447a74 100644 --- a/arch/ia64/include/asm/asm-prototypes.h +++ b/arch/ia64/include/asm/asm-prototypes.h @@ -9,7 +9,7 @@ #include <asm/page.h> #include <asm/pal.h> #include <asm/string.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unwind.h> #include <asm/xor.h> diff --git a/arch/mips/include/asm/asm-prototypes.h b/arch/mips/include/asm/asm-prototypes.h index d60b57f34e92..576f1a62dea9 100644 --- a/arch/mips/include/asm/asm-prototypes.h +++ b/arch/mips/include/asm/asm-prototypes.h @@ -3,5 +3,5 @@ #include <asm/page.h> #include <asm/fpu.h> #include <asm-generic/asm-prototypes.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/ftrace.h> diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c index 0d750d274c4e..6882bc94eba8 100644 --- a/arch/powerpc/kvm/book3s_xive.c +++ b/arch/powerpc/kvm/book3s_xive.c @@ -16,7 +16,7 @@ #include <linux/delay.h> #include <linux/percpu.h> #include <linux/cpumask.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/kvm_book3s.h> #include <asm/kvm_ppc.h> #include <asm/hvcall.h> diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index d74d4adf2d54..d7c6ca7c95ae 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -25,9 +25,9 @@ #include <linux/sched/task_stack.h> #include <linux/tick.h> #include <linux/ptrace.h> +#include <linux/uaccess.h> #include <asm/unistd.h> -#include <asm/uaccess.h> #include <asm/processor.h> #include <asm/csr.h> #include <asm/string.h> diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c index 0713f3c67ab4..ceebfc29305b 100644 --- a/arch/riscv/mm/fault.c +++ b/arch/riscv/mm/fault.c @@ -29,7 +29,6 @@ #include <asm/pgalloc.h> #include <asm/ptrace.h> -#include <asm/uaccess.h> /* * This routine handles page faults. It determines the address and the diff --git a/arch/sparc/include/asm/asm-prototypes.h b/arch/sparc/include/asm/asm-prototypes.h index 96e0972e8dbf..4987c735ff56 100644 --- a/arch/sparc/include/asm/asm-prototypes.h +++ b/arch/sparc/include/asm/asm-prototypes.h @@ -6,7 +6,7 @@ #include <asm/xor.h> #include <asm/checksum.h> #include <asm/trap_block.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/atomic.h> #include <asm/ftrace.h> #include <asm/cacheflush.h> |