diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-27 19:33:24 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-27 19:33:24 +0300 |
| commit | 508fea71c6b2108ce81814a58fbc8c8aaf5e430f (patch) | |
| tree | 3335f45f6babc5b31ce678de6e8132bab32752d5 | |
| parent | 9453203bf868a9b36227c961c68c8892c7262355 (diff) | |
| parent | a8950e49bd241dc9ad90c24e92e23e95dbe9f018 (diff) | |
| download | linux-508fea71c6b2108ce81814a58fbc8c8aaf5e430f.tar.xz | |
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
| -rw-r--r-- | arch/nios2/lib/memset.c | 2 |
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 */ |