summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2020-05-01 12:36:22 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2020-05-01 12:36:22 +1000
commit1f59cc3482c645c956a06e1b587e49df8d42ebab (patch)
tree2496b1c256ed6a61431c6fbd1738ddec92c0b578 /include
parent17bc43367fc2a720400d21c745db641c654c1e6b (diff)
parentb44f687386875b714dae2afa768e73401e45c21c (diff)
Merge branch 'topic/uaccess' into topic/uaccess-ppc
Merge the generic changes to add user_[read|write]_access_begin().
Diffstat (limited to 'include')
-rw-r--r--include/linux/uaccess.h8
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,