diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-12-01 01:02:00 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-12-01 01:02:00 +0800 |
| commit | 81ab793d6dcb61c8ca908b442cc7b98be7ffa02c (patch) | |
| tree | 9fb8e8f214ba8d82daba9f546b7ec348c357f115 /arch/parisc | |
| parent | d8e6d09cfa7260b12501ce94ca35977be998d4a7 (diff) | |
| parent | 08c15ad2e6278a5fe1b209e8fcdbd2d235c48f34 (diff) | |
Merge tag 'v4.4.103' into linux-linaro-lsk-v4.4
This is the 4.4.103 stable release
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/kernel/syscall.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S index c6b855f7892c..9f22195b90ed 100644 --- a/arch/parisc/kernel/syscall.S +++ b/arch/parisc/kernel/syscall.S @@ -688,15 +688,15 @@ cas_action: /* ELF32 Process entry path */ lws_compare_and_swap_2: #ifdef CONFIG_64BIT - /* Clip the input registers */ + /* Clip the input registers. We don't need to clip %r23 as we + only use it for word operations */ depdi 0, 31, 32, %r26 depdi 0, 31, 32, %r25 depdi 0, 31, 32, %r24 - depdi 0, 31, 32, %r23 #endif /* Check the validity of the size pointer */ - subi,>>= 4, %r23, %r0 + subi,>>= 3, %r23, %r0 b,n lws_exit_nosys /* Jump to the functions which will load the old and new values into |