summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-27 09:33:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-27 09:33:24 -0700
commit508fea71c6b2108ce81814a58fbc8c8aaf5e430f (patch)
tree3335f45f6babc5b31ce678de6e8132bab32752d5 /arch
parent9453203bf868a9b36227c961c68c8892c7262355 (diff)
parenta8950e49bd241dc9ad90c24e92e23e95dbe9f018 (diff)
downloadlinux-508fea71c6b2108ce81814a58fbc8c8aaf5e430f.tar.bz2
Merge tag 'nios2-v4.6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2
Pull arch/nios2 fix from Ley Foon Tan: "memset: use the right constraint modifier for the %4 output operand" * tag 'nios2-v4.6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2: nios2: memset: use the right constraint modifier for the %4 output operand
Diffstat (limited to 'arch')
-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 */