summaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-03-20 21:08:07 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2017-03-28 16:43:25 -0400
commitdb68ce10c4f0a27c1ff9fa0e789e5c41f8c4ea63 (patch)
tree77eda1d247853a2d414e0047c620b3c72bb11a1a /arch/sparc
parentaaa2e7ac80f679230faf28a8e12e8d68dbe977eb (diff)
new helper: uaccess_kernel()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/include/asm/uaccess.h2
-rw-r--r--arch/sparc/include/asm/uaccess_32.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
index bd56c28fff9f..9e068bf9060a 100644
--- a/arch/sparc/include/asm/uaccess.h
+++ b/arch/sparc/include/asm/uaccess.h
@@ -7,7 +7,7 @@
7#endif 7#endif
8 8
9#define user_addr_max() \ 9#define user_addr_max() \
10 (segment_eq(get_fs(), USER_DS) ? TASK_SIZE : ~0UL) 10 (uaccess_kernel() ? ~0UL : TASK_SIZE)
11 11
12long strncpy_from_user(char *dest, const char __user *src, long count); 12long strncpy_from_user(char *dest, const char __user *src, long count);
13 13
diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
index 952d512a64f2..a59a1e81986d 100644
--- a/arch/sparc/include/asm/uaccess_32.h
+++ b/arch/sparc/include/asm/uaccess_32.h
@@ -36,7 +36,7 @@
36 * large size and address near to PAGE_OFFSET - a fault will break his intentions. 36 * large size and address near to PAGE_OFFSET - a fault will break his intentions.
37 */ 37 */
38#define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; }) 38#define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; })
39#define __kernel_ok (segment_eq(get_fs(), KERNEL_DS)) 39#define __kernel_ok (uaccess_kernel())
40#define __access_ok(addr, size) (__user_ok((addr) & get_fs().seg, (size))) 40#define __access_ok(addr, size) (__user_ok((addr) & get_fs().seg, (size)))
41#define access_ok(type, addr, size) \ 41#define access_ok(type, addr, size) \
42 ({ (void)(type); __access_ok((unsigned long)(addr), size); }) 42 ({ (void)(type); __access_ok((unsigned long)(addr), size); })