diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:02:33 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:02:33 +0800 |
| commit | 156f7b56ee4b918b95991750e0f34da8ad416eae (patch) | |
| tree | fd47da260b3c78631721f36edf01b2878358283a /arch/arm/lib/getuser.S | |
| parent | 2e2fb031287a5946d97b85769f80ca60f0166e15 (diff) | |
| parent | d97f745e1d2fea4d2f308e5e06eee81a9a84f3f5 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-17.06-rtlsk-v4.1-17.05-rtlsk-v4.1-17.03-rt
Diffstat (limited to 'arch/arm/lib/getuser.S')
| -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] |