git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/~dwmw2/firmware-2.6
[sfrench/cifs-2.6.git]
/
arch
/
m68k
/
lib
/
uaccess.c
diff --git
a/arch/m68k/lib/uaccess.c
b/arch/m68k/lib/uaccess.c
index 865f9fb9e6866a15cf1e18812be3dec3e229e918..13854ed8cd9ad226497e5ab6fe79d4636138a7a9 100644
(file)
--- 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);