diff options
Diffstat (limited to 'arch/um/kernel/skas')
-rw-r--r-- | arch/um/kernel/skas/uaccess.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/um/kernel/skas/uaccess.c b/arch/um/kernel/skas/uaccess.c index 8912cec0fe43..b14422e2c07c 100644 --- a/arch/um/kernel/skas/uaccess.c +++ b/arch/um/kernel/skas/uaccess.c | |||
@@ -139,7 +139,7 @@ static int copy_chunk_from_user(unsigned long from, int len, void *arg) | |||
139 | return(0); | 139 | return(0); |
140 | } | 140 | } |
141 | 141 | ||
142 | int copy_from_user_skas(void *to, const void __user *from, int n) | 142 | int copy_from_user(void *to, const void __user *from, int n) |
143 | { | 143 | { |
144 | if(segment_eq(get_fs(), KERNEL_DS)){ | 144 | if(segment_eq(get_fs(), KERNEL_DS)){ |
145 | memcpy(to, (__force void*)from, n); | 145 | memcpy(to, (__force void*)from, n); |
@@ -160,7 +160,7 @@ static int copy_chunk_to_user(unsigned long to, int len, void *arg) | |||
160 | return(0); | 160 | return(0); |
161 | } | 161 | } |
162 | 162 | ||
163 | int copy_to_user_skas(void __user *to, const void *from, int n) | 163 | int copy_to_user(void __user *to, const void *from, int n) |
164 | { | 164 | { |
165 | if(segment_eq(get_fs(), KERNEL_DS)){ | 165 | if(segment_eq(get_fs(), KERNEL_DS)){ |
166 | memcpy((__force void*)to, from, n); | 166 | memcpy((__force void*)to, from, n); |
@@ -186,7 +186,7 @@ static int strncpy_chunk_from_user(unsigned long from, int len, void *arg) | |||
186 | return(0); | 186 | return(0); |
187 | } | 187 | } |
188 | 188 | ||
189 | int strncpy_from_user_skas(char *dst, const char __user *src, int count) | 189 | int strncpy_from_user(char *dst, const char __user *src, int count) |
190 | { | 190 | { |
191 | int n; | 191 | int n; |
192 | char *ptr = dst; | 192 | char *ptr = dst; |
@@ -212,12 +212,12 @@ static int clear_chunk(unsigned long addr, int len, void *unused) | |||
212 | return(0); | 212 | return(0); |
213 | } | 213 | } |
214 | 214 | ||
215 | int __clear_user_skas(void __user *mem, int len) | 215 | int __clear_user(void __user *mem, int len) |
216 | { | 216 | { |
217 | return(buffer_op((unsigned long) mem, len, 1, clear_chunk, NULL)); | 217 | return(buffer_op((unsigned long) mem, len, 1, clear_chunk, NULL)); |
218 | } | 218 | } |
219 | 219 | ||
220 | int clear_user_skas(void __user *mem, int len) | 220 | int clear_user(void __user *mem, int len) |
221 | { | 221 | { |
222 | if(segment_eq(get_fs(), KERNEL_DS)){ | 222 | if(segment_eq(get_fs(), KERNEL_DS)){ |
223 | memset((__force void*)mem, 0, len); | 223 | memset((__force void*)mem, 0, len); |
@@ -240,7 +240,7 @@ static int strnlen_chunk(unsigned long str, int len, void *arg) | |||
240 | return(0); | 240 | return(0); |
241 | } | 241 | } |
242 | 242 | ||
243 | int strnlen_user_skas(const void __user *str, int len) | 243 | int strnlen_user(const void __user *str, int len) |
244 | { | 244 | { |
245 | int count = 0, n; | 245 | int count = 0, n; |
246 | 246 | ||