diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-05-15 12:42:15 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-05-15 12:42:15 -0700 |
| commit | 15a6affec4449b54afba15ab7edbad0cac2736d3 (patch) | |
| tree | f2fa815f74be0b56acd05e62113600a7113d48a9 /arch/arc/mm/extable.c | |
| parent | cd432fc233f4e7aba43b4fe499a4445f0f6ee1c6 (diff) | |
| parent | f722406faae2d073cc1d01063d1123c35425939e (diff) | |
Merge tag 'v3.10-rc1' into linaro-android-3.10-experimental-mergetracking-linaro-android-3.10-llct-20130518.0
Linux 3.10-rc1
Diffstat (limited to 'arch/arc/mm/extable.c')
| -rw-r--r-- | arch/arc/mm/extable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arc/mm/extable.c b/arch/arc/mm/extable.c index 014172ba8432..aa652e281324 100644 --- a/arch/arc/mm/extable.c +++ b/arch/arc/mm/extable.c @@ -27,7 +27,7 @@ int fixup_exception(struct pt_regs *regs) #ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE -long arc_copy_from_user_noinline(void *to, const void __user * from, +long arc_copy_from_user_noinline(void *to, const void __user *from, unsigned long n) { return __arc_copy_from_user(to, from, n); @@ -48,7 +48,7 @@ unsigned long arc_clear_user_noinline(void __user *to, } EXPORT_SYMBOL(arc_clear_user_noinline); -long arc_strncpy_from_user_noinline (char *dst, const char __user *src, +long arc_strncpy_from_user_noinline(char *dst, const char __user *src, long count) { return __arc_strncpy_from_user(dst, src, count); |