aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/m68k/lib/uaccess.c4
-rw-r--r--include/asm-m68k/uaccess.h4
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/m68k/lib/uaccess.c b/arch/m68k/lib/uaccess.c
index 865f9fb9e686..13854ed8cd9a 100644
--- a/arch/m68k/lib/uaccess.c
+++ b/arch/m68k/lib/uaccess.c
@@ -181,7 +181,7 @@ EXPORT_SYMBOL(strnlen_user);
181 * Zero Userspace 181 * Zero Userspace
182 */ 182 */
183 183
184unsigned long clear_user(void __user *to, unsigned long n) 184unsigned long __clear_user(void __user *to, unsigned long n)
185{ 185{
186 unsigned long res; 186 unsigned long res;
187 187
@@ -219,4 +219,4 @@ unsigned long clear_user(void __user *to, unsigned long n)
219 219
220 return res; 220 return res;
221} 221}
222EXPORT_SYMBOL(clear_user); 222EXPORT_SYMBOL(__clear_user);
diff --git a/include/asm-m68k/uaccess.h b/include/asm-m68k/uaccess.h
index 6a4cf2081512..5c1264cf0c65 100644
--- a/include/asm-m68k/uaccess.h
+++ b/include/asm-m68k/uaccess.h
@@ -361,7 +361,9 @@ __constant_copy_to_user(void __user *to, const void *from, unsigned long n)
361 361
362long strncpy_from_user(char *dst, const char __user *src, long count); 362long strncpy_from_user(char *dst, const char __user *src, long count);
363long strnlen_user(const char __user *src, long n); 363long strnlen_user(const char __user *src, long n);
364unsigned long clear_user(void __user *to, unsigned long n); 364unsigned long __clear_user(void __user *to, unsigned long n);
365
366#define clear_user __clear_user
365 367
366#define strlen_user(str) strnlen_user(str, 32767) 368#define strlen_user(str) strnlen_user(str, 32767)
367 369