diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-08 11:49:24 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-08 11:49:24 -0500 |
| commit | 9446389ef612096704fdf18fa79bab423d4110f0 (patch) | |
| tree | 3e4fda7270be58ae176d20d318e61fb115b325b5 /arch/cris/arch-v32/lib/usercopy.c | |
| parent | cdd0972945dbcb8ea24db365d9b0e100af2a27bb (diff) | |
| parent | 84c6f6046c5a2189160a8f0dca8b90427bf690ea (diff) | |
Merge commit 'origin' into devel
Diffstat (limited to 'arch/cris/arch-v32/lib/usercopy.c')
| -rw-r--r-- | arch/cris/arch-v32/lib/usercopy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/lib/usercopy.c b/arch/cris/arch-v32/lib/usercopy.c index 04d0cf35a27..0b5b70d5f58 100644 --- a/arch/cris/arch-v32/lib/usercopy.c +++ b/arch/cris/arch-v32/lib/usercopy.c @@ -161,7 +161,7 @@ __copy_user (void __user *pdst, const void *psrc, unsigned long pn) inaccessible. */ unsigned long -__copy_user_zeroing (void __user *pdst, const void *psrc, unsigned long pn) +__copy_user_zeroing(void *pdst, const void __user *psrc, unsigned long pn) { /* We want the parameters put in special registers. Make sure the compiler is able to make something useful of this. |