diff options
| author | Geert Uytterhoeven | 2007-05-15 10:41:29 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2007-05-15 17:54:00 +0200 |
| commit | 3c46bdcaec53eda069a8a9cd60621c7431aa7842 (patch) | |
| tree | 9e3463d9618af5be9195d4cbaef6d3a518ab9e26 | |
| parent | alpha: fix hard_smp_processor_id compile error (diff) | |
| download | kernel-qcow2-linux-3c46bdcaec53eda069a8a9cd60621c7431aa7842.tar.gz kernel-qcow2-linux-3c46bdcaec53eda069a8a9cd60621c7431aa7842.tar.xz kernel-qcow2-linux-3c46bdcaec53eda069a8a9cd60621c7431aa7842.zip | |
m68k: implement __clear_user()
m68k: implement __clear_user(), which is needed by fs/signalfd.c
Since we always let the MMU do all checking, clear_user() and __clear_user()
are identical. The old clear_user() is renamed to __clear_user() for
consistency.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/m68k/lib/uaccess.c | 4 | ||||
| -rw-r--r-- | include/asm-m68k/uaccess.h | 4 |
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); * 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/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) 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) |