summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-04-06 02:15:53 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2017-04-26 19:11:01 +0300
commit701cac61d0250912b89cbc28589969530179099a (patch)
tree1e3f472d176af49a5b92054a922272b8046b4ff3 /include/linux
parenteea86b637a15bc4d4bd518b11330ac96baa6b73d (diff)
downloadlinux-701cac61d0250912b89cbc28589969530179099a.tar.xz
CONFIG_ARCH_HAS_RAW_COPY_USER is unconditional now
all architectures converted Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/uaccess.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
index 7fc2104b88bc..e0cbfb09e60f 100644
--- a/include/linux/uaccess.h
+++ b/include/linux/uaccess.h
@@ -12,12 +12,10 @@
#include <asm/uaccess.h>
-#ifdef CONFIG_ARCH_HAS_RAW_COPY_USER
/*
* Architectures should provide two primitives (raw_copy_{to,from}_user())
- * select ARCH_HAS_RAW_COPY_FROM_USER and get rid of their private instances
- * of copy_{to,from}_user() and __copy_{to,from}_user{,_inatomic}(). Once
- * all of them switch, this part of linux/uaccess.h will become unconditional.
+ * and get rid of their private instances of copy_{to,from}_user() and
+ * __copy_{to,from}_user{,_inatomic}().
*
* raw_copy_{to,from}_user(to, from, size) should copy up to size bytes and
* return the amount left to copy. They should assume that access_ok() has
@@ -196,7 +194,6 @@ copy_in_user(void __user *to, const void *from, unsigned long n)
return n;
}
#endif
-#endif
static __always_inline void pagefault_disabled_inc(void)
{