summaryrefslogtreecommitdiffstats
path: root/arch/nios2/lib/memset.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-05-05 10:12:37 +0200
committerIngo Molnar <mingo@kernel.org>2016-05-05 10:12:37 +0200
commit1a618c2cfe4c02190d8d1f9c5052f0defc58de20 (patch)
tree170002288786f702e1d4ca638b53d1594a7caa16 /arch/nios2/lib/memset.c
parent03d85a63ee3e2d3a43460f936b86334b32f88c89 (diff)
parent8482716b9d865db34c55d4bf2fed19498e7195b9 (diff)
downloadlinux-1a618c2cfe4c02190d8d1f9c5052f0defc58de20.tar.bz2
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/nios2/lib/memset.c')
-rw-r--r--arch/nios2/lib/memset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/nios2/lib/memset.c b/arch/nios2/lib/memset.c
index c2cfcb121e34..2fcefe720283 100644
--- a/arch/nios2/lib/memset.c
+++ b/arch/nios2/lib/memset.c
@@ -68,7 +68,7 @@ void *memset(void *s, int c, size_t count)
"=r" (charcnt), /* %1 Output */
"=r" (dwordcnt), /* %2 Output */
"=r" (fill8reg), /* %3 Output */
- "=r" (wrkrega) /* %4 Output */
+ "=&r" (wrkrega) /* %4 Output only */
: "r" (c), /* %5 Input */
"0" (s), /* %0 Input/Output */
"1" (count) /* %1 Input/Output */