diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-15 21:17:52 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-15 21:17:52 +0300 |
commit | 89cbec71fead552fdd1fa38c57186669dfbba734 (patch) | |
tree | 0e8e235b23b0fc1cd2d32bb28cafdee636e62d51 /arch/parisc/include | |
parent | 2173bd06315109ec73e7a6077c11469bd41d400b (diff) | |
parent | 3170d8d226c2053355f3946b4b5ded4c006fe6d4 (diff) | |
download | linux-89cbec71fead552fdd1fa38c57186669dfbba734.tar.xz |
Merge branch 'work.uaccess-unaligned' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull uacess-unaligned removal from Al Viro:
"That stuff had just one user, and an exotic one, at that - binfmt_flat
on arm and m68k"
* 'work.uaccess-unaligned' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
kill {__,}{get,put}_user_unaligned()
binfmt_flat: flat_{get,put}_addr_from_rp() should be able to fail
Diffstat (limited to 'arch/parisc/include')
-rw-r--r-- | arch/parisc/include/asm/uaccess.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h index 1fd962a07f52..cab33a0d0e82 100644 --- a/arch/parisc/include/asm/uaccess.h +++ b/arch/parisc/include/asm/uaccess.h @@ -6,7 +6,6 @@ */ #include <asm/page.h> #include <asm/cache.h> -#include <asm-generic/uaccess-unaligned.h> #include <linux/bug.h> #include <linux/string.h> |