diff options
| author | Chris Mason <clm@fb.com> | 2016-05-17 14:43:19 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-05-17 14:43:19 -0700 |
| commit | c315ef8d9db7f1a0ebd023a395ebdfde1c68057e (patch) | |
| tree | 501e1fc558de9e56b78e457aa928fa255e660486 /arch/nios2/lib/memset.c | |
| parent | a88336d13c66fc171f336c6332fcb67339894e08 (diff) | |
| parent | 5f9a8a51d8b95505d8de8b7191ae2ed8c504d4af (diff) | |
Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'arch/nios2/lib/memset.c')
| -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 */ |