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 /include/linux | |
| 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 'include/linux')
| -rw-r--r-- | include/linux/flat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/flat.h b/include/linux/flat.h index 2c1eb15c4ba4..7d542dfd0def 100644 --- a/include/linux/flat.h +++ b/include/linux/flat.h @@ -9,8 +9,8 @@ #ifndef _LINUX_FLAT_H #define _LINUX_FLAT_H -#include <asm/flat.h> #include <uapi/linux/flat.h> +#include <asm/flat.h> /* * While it would be nice to keep this header clean, users of older |