diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-15 16:11:17 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-15 16:11:17 -0400 |
| commit | 6684e323a236d40461f27d36b38c6b70aabc9e71 (patch) | |
| tree | 7eb6e0a22b7083c5e08f4f2cf3f15be7d938a572 /arch/m68k/lib/uaccess.c | |
| parent | 7531d692d4174789d583eb50fcb83cefa121b790 (diff) | |
| parent | 0560551dca0c02a4b23f95a9c339882ff291e1c7 (diff) | |
Merge branch 'origin'
Diffstat (limited to 'arch/m68k/lib/uaccess.c')
| -rw-r--r-- | arch/m68k/lib/uaccess.c | 4 |
1 files changed, 2 insertions, 2 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 | ||
| 184 | unsigned long clear_user(void __user *to, unsigned long n) | 184 | unsigned 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 | } |
| 222 | EXPORT_SYMBOL(clear_user); | 222 | EXPORT_SYMBOL(__clear_user); |