diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-15 11:17:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-15 11:17:52 -0700 |
| commit | 89cbec71fead552fdd1fa38c57186669dfbba734 (patch) | |
| tree | 0e8e235b23b0fc1cd2d32bb28cafdee636e62d51 /arch/s390 | |
| parent | 2173bd06315109ec73e7a6077c11469bd41d400b (diff) | |
| parent | 3170d8d226c2053355f3946b4b5ded4c006fe6d4 (diff) | |
| download | linux-89cbec71fead552fdd1fa38c57186669dfbba734.tar.gz linux-89cbec71fead552fdd1fa38c57186669dfbba734.tar.bz2 linux-89cbec71fead552fdd1fa38c57186669dfbba734.zip | |
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/s390')
| -rw-r--r-- | arch/s390/include/asm/uaccess.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h index 28b528197cf5..304cfe44df50 100644 --- a/arch/s390/include/asm/uaccess.h +++ b/arch/s390/include/asm/uaccess.h @@ -249,9 +249,6 @@ int __put_user_bad(void) __attribute__((noreturn)); int __get_user_bad(void) __attribute__((noreturn)); -#define __put_user_unaligned __put_user -#define __get_user_unaligned __get_user - unsigned long __must_check raw_copy_in_user(void __user *to, const void __user *from, unsigned long n); |