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 /include/asm-generic | |
parent | 2173bd06315109ec73e7a6077c11469bd41d400b (diff) | |
parent | 3170d8d226c2053355f3946b4b5ded4c006fe6d4 (diff) | |
download | blackbird-obmc-linux-89cbec71fead552fdd1fa38c57186669dfbba734.tar.gz blackbird-obmc-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 'include/asm-generic')
-rw-r--r-- | include/asm-generic/uaccess-unaligned.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/include/asm-generic/uaccess-unaligned.h b/include/asm-generic/uaccess-unaligned.h deleted file mode 100644 index 67deb898f0c5..000000000000 --- a/include/asm-generic/uaccess-unaligned.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef __ASM_GENERIC_UACCESS_UNALIGNED_H -#define __ASM_GENERIC_UACCESS_UNALIGNED_H - -/* - * This macro should be used instead of __get_user() when accessing - * values at locations that are not known to be aligned. - */ -#define __get_user_unaligned(x, ptr) \ -({ \ - __typeof__ (*(ptr)) __x; \ - __copy_from_user(&__x, (ptr), sizeof(*(ptr))) ? -EFAULT : 0; \ - (x) = __x; \ -}) - - -/* - * This macro should be used instead of __put_user() when accessing - * values at locations that are not known to be aligned. - */ -#define __put_user_unaligned(x, ptr) \ -({ \ - __typeof__ (*(ptr)) __x = (x); \ - __copy_to_user((ptr), &__x, sizeof(*(ptr))) ? -EFAULT : 0; \ -}) - -#endif /* __ASM_GENERIC_UACCESS_UNALIGNED_H */ |