diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-01-22 12:01:29 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-01-22 12:01:29 +0800 |
| commit | 824ce96ff92c399f5bd2ee308f231300e7e89174 (patch) | |
| tree | 289a4cf91ad01cdd1385949b02a3e6ad3c7a0579 /arch/arc/include/asm/uaccess.h | |
| parent | 2273228cf26ccc4f6836b57e67defd09c3aede90 (diff) | |
| parent | 2f15316c0075bbe84e4e7897827860f52523eae1 (diff) | |
Merge remote-tracking branch 'rt-stable/v4.4-rt' into linux-linaro-lsk-v4.4-rt
Diffstat (limited to 'arch/arc/include/asm/uaccess.h')
| -rw-r--r-- | arch/arc/include/asm/uaccess.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arc/include/asm/uaccess.h b/arch/arc/include/asm/uaccess.h index d4d8df706efa..57387b567f34 100644 --- a/arch/arc/include/asm/uaccess.h +++ b/arch/arc/include/asm/uaccess.h @@ -673,6 +673,7 @@ __arc_strncpy_from_user(char *dst, const char __user *src, long count) return 0; __asm__ __volatile__( + " mov lp_count, %5 \n" " lp 3f \n" "1: ldb.ab %3, [%2, 1] \n" " breq.d %3, 0, 3f \n" @@ -689,8 +690,8 @@ __arc_strncpy_from_user(char *dst, const char __user *src, long count) " .word 1b, 4b \n" " .previous \n" : "+r"(res), "+r"(dst), "+r"(src), "=r"(val) - : "g"(-EFAULT), "l"(count) - : "memory"); + : "g"(-EFAULT), "r"(count) + : "lp_count", "lp_start", "lp_end", "memory"); return res; } |