diff options
author | David S. Miller <davem@davemloft.net> | 2017-02-19 11:18:46 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-02-19 11:18:46 -0500 |
commit | f787d1debf63f78a15b2d1c79e7f1788c4fadfa0 (patch) | |
tree | 97811cde0b0b3f3f32af3eb48516d539d60573f5 /arch/arm/lib | |
parent | tcp: use page_ref_inc() in tcp_sendmsg() (diff) | |
parent | ipv6: release dst on error in ip6_dst_lookup_tail (diff) | |
download | linux-dev-f787d1debf63f78a15b2d1c79e7f1788c4fadfa0.tar.xz linux-dev-f787d1debf63f78a15b2d1c79e7f1788c4fadfa0.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm/lib')
-rw-r--r-- | arch/arm/lib/getuser.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S index 8ecfd15c3a02..df73914e81c8 100644 --- a/arch/arm/lib/getuser.S +++ b/arch/arm/lib/getuser.S @@ -67,7 +67,7 @@ ENTRY(__get_user_4) ENDPROC(__get_user_4) ENTRY(__get_user_8) - check_uaccess r0, 8, r1, r2, __get_user_bad + check_uaccess r0, 8, r1, r2, __get_user_bad8 #ifdef CONFIG_THUMB2_KERNEL 5: TUSER(ldr) r2, [r0] 6: TUSER(ldr) r3, [r0, #4] |