diff options
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/lib/uaccess.h | 9 | ||||
-rw-r--r-- | arch/s390/lib/uaccess_pt.c | 4 |
2 files changed, 2 insertions, 11 deletions
diff --git a/arch/s390/lib/uaccess.h b/arch/s390/lib/uaccess.h index 315dbe09983e..b1a22173d027 100644 --- a/arch/s390/lib/uaccess.h +++ b/arch/s390/lib/uaccess.h | |||
@@ -6,15 +6,6 @@ | |||
6 | #ifndef __ARCH_S390_LIB_UACCESS_H | 6 | #ifndef __ARCH_S390_LIB_UACCESS_H |
7 | #define __ARCH_S390_LIB_UACCESS_H | 7 | #define __ARCH_S390_LIB_UACCESS_H |
8 | 8 | ||
9 | extern size_t copy_from_user_std(size_t, const void __user *, void *); | ||
10 | extern size_t copy_to_user_std(size_t, void __user *, const void *); | ||
11 | extern size_t strnlen_user_std(size_t, const char __user *); | ||
12 | extern size_t strncpy_from_user_std(size_t, const char __user *, char *); | ||
13 | extern int futex_atomic_cmpxchg_std(u32 *, u32 __user *, u32, u32); | ||
14 | extern int futex_atomic_op_std(int, u32 __user *, int, int *); | ||
15 | |||
16 | extern size_t copy_from_user_pt(size_t, const void __user *, void *); | ||
17 | extern size_t copy_to_user_pt(size_t, void __user *, const void *); | ||
18 | extern int futex_atomic_op_pt(int, u32 __user *, int, int *); | 9 | extern int futex_atomic_op_pt(int, u32 __user *, int, int *); |
19 | extern int futex_atomic_cmpxchg_pt(u32 *, u32 __user *, u32, u32); | 10 | extern int futex_atomic_cmpxchg_pt(u32 *, u32 __user *, u32, u32); |
20 | 11 | ||
diff --git a/arch/s390/lib/uaccess_pt.c b/arch/s390/lib/uaccess_pt.c index 5b77c341a1e3..61ebcc9ccb34 100644 --- a/arch/s390/lib/uaccess_pt.c +++ b/arch/s390/lib/uaccess_pt.c | |||
@@ -211,7 +211,7 @@ fault: | |||
211 | return 0; | 211 | return 0; |
212 | } | 212 | } |
213 | 213 | ||
214 | size_t copy_from_user_pt(size_t n, const void __user *from, void *to) | 214 | static size_t copy_from_user_pt(size_t n, const void __user *from, void *to) |
215 | { | 215 | { |
216 | size_t rc; | 216 | size_t rc; |
217 | 217 | ||
@@ -223,7 +223,7 @@ size_t copy_from_user_pt(size_t n, const void __user *from, void *to) | |||
223 | return rc; | 223 | return rc; |
224 | } | 224 | } |
225 | 225 | ||
226 | size_t copy_to_user_pt(size_t n, void __user *to, const void *from) | 226 | static size_t copy_to_user_pt(size_t n, void __user *to, const void *from) |
227 | { | 227 | { |
228 | if (segment_eq(get_fs(), KERNEL_DS)) | 228 | if (segment_eq(get_fs(), KERNEL_DS)) |
229 | return copy_in_kernel(n, to, (void __user *) from); | 229 | return copy_in_kernel(n, to, (void __user *) from); |