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/mips/include/asm | |
| parent | dc1efc3cfaf5e16870a9a7b1b903dcf6e3ef15e8 (diff) | |
| parent | c68070d0408eb2297331a9c9ae538a7bec13fc81 (diff) | |
| download | linux-40b9672a2f071cbf931eb144997a21332bc0a747.tar.gz linux-40b9672a2f071cbf931eb144997a21332bc0a747.tar.bz2 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/mips/include/asm')
| -rw-r--r-- | arch/mips/include/asm/asm-prototypes.h | 2 |
1 files changed, 1 insertions, 1 deletions
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> |