diff options
| author | Michael Ellerman <[email protected]> | 2020-05-20 23:37:33 +1000 |
|---|---|---|
| committer | Michael Ellerman <[email protected]> | 2020-05-20 23:37:33 +1000 |
| commit | 217ba7dccef8e811eee43003bfef24f1902f37c9 (patch) | |
| tree | 4ae0ab57daa2424f510850aa56352b0838265474 /include/linux | |
| parent | 30df74d67d48949da87e3a5b57c381763e8fd526 (diff) | |
| parent | e2a8b49e79553bd8ec48f73cead84e6146c09408 (diff) | |
Merge branch 'topic/uaccess-ppc' into next
Merge our uaccess-ppc topic branch. It is based on the uaccess topic
branch that we're sharing with Viro.
This includes the addition of user_[read|write]_access_begin(), as
well as some powerpc specific changes to our uaccess routines that
would conflict badly if merged separately.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/uaccess.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h index 67f016010aad..9861c89f93be 100644 --- a/include/linux/uaccess.h +++ b/include/linux/uaccess.h @@ -378,6 +378,14 @@ extern long strnlen_unsafe_user(const void __user *unsafe_addr, long count); static inline unsigned long user_access_save(void) { return 0UL; } static inline void user_access_restore(unsigned long flags) { } #endif +#ifndef user_write_access_begin +#define user_write_access_begin user_access_begin +#define user_write_access_end user_access_end +#endif +#ifndef user_read_access_begin +#define user_read_access_begin user_access_begin +#define user_read_access_end user_access_end +#endif #ifdef CONFIG_HARDENED_USERCOPY void usercopy_warn(const char *name, const char *detail, bool to_user, |