diff options
| author | Linus Torvalds | 2018-02-01 04:18:12 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2018-02-01 04:18:12 +0100 |
| commit | 40b9672a2f071cbf931eb144997a21332bc0a747 (patch) | |
| tree | 9ca1d0e049e3163cec7d337e9d4458e7ab2c857f /arch/alpha | |
| parent | Merge branch 'work.dcache' of git://git.kernel.org/pub/scm/linux/kernel/git/v... (diff) | |
| parent | asm-prototypes.h: use linux/uaccess.h, not asm/uaccess.h (diff) | |
| download | kernel-qcow2-linux-40b9672a2f071cbf931eb144997a21332bc0a747.tar.gz kernel-qcow2-linux-40b9672a2f071cbf931eb144997a21332bc0a747.tar.xz kernel-qcow2-linux-40b9672a2f071cbf931eb144997a21332bc0a747.zip | |
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/alpha')
| -rw-r--r-- | arch/alpha/include/asm/asm-prototypes.h | 2 |
1 files changed, 1 insertions, 1 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> |