diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-03 08:23:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-03 08:23:58 +0200 |
| commit | b33f39e9d17dd7d636ebb38f9ce248f8a085ff49 (patch) | |
| tree | 906da63259959326e15cbd3bff032125816d3234 /arch/nios2/lib/memset.c | |
| parent | bf92b1feb658f6a262daf3a87d790997a1dca0ff (diff) | |
| parent | 04974df8049fc4240d22759a91e035082ccd18b4 (diff) | |
Merge tag 'v4.6-rc6' into ras/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 */ |