From e91f292fd4930926fae80b1cacd6971ffeec055f Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 15 May 2007 01:41:29 -0700 Subject: [PATCH] --- yaml --- r: 56392 b: refs/heads/master c: 3c46bdcaec53eda069a8a9cd60621c7431aa7842 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/lib/uaccess.c | 4 ++-- trunk/include/asm-m68k/uaccess.h | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 73918c562210..37421b264823 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0fcdf96ca95f81a0e1fd91a2de16dc67c641c958 +refs/heads/master: 3c46bdcaec53eda069a8a9cd60621c7431aa7842 diff --git a/trunk/arch/m68k/lib/uaccess.c b/trunk/arch/m68k/lib/uaccess.c index 865f9fb9e686..13854ed8cd9a 100644 --- a/trunk/arch/m68k/lib/uaccess.c +++ b/trunk/arch/m68k/lib/uaccess.c @@ -181,7 +181,7 @@ EXPORT_SYMBOL(strnlen_user); * Zero Userspace */ -unsigned long clear_user(void __user *to, unsigned long n) +unsigned long __clear_user(void __user *to, unsigned long n) { unsigned long res; @@ -219,4 +219,4 @@ unsigned long clear_user(void __user *to, unsigned long n) return res; } -EXPORT_SYMBOL(clear_user); +EXPORT_SYMBOL(__clear_user); diff --git a/trunk/include/asm-m68k/uaccess.h b/trunk/include/asm-m68k/uaccess.h index 6a4cf2081512..5c1264cf0c65 100644 --- a/trunk/include/asm-m68k/uaccess.h +++ b/trunk/include/asm-m68k/uaccess.h @@ -361,7 +361,9 @@ __constant_copy_to_user(void __user *to, const void *from, unsigned long n) long strncpy_from_user(char *dst, const char __user *src, long count); long strnlen_user(const char __user *src, long n); -unsigned long clear_user(void __user *to, unsigned long n); +unsigned long __clear_user(void __user *to, unsigned long n); + +#define clear_user __clear_user #define strlen_user(str) strnlen_user(str, 32767)