diff options
| author | Heiko Carstens <hca@linux.ibm.com> | 2023-01-04 16:55:53 +0100 |
|---|---|---|
| committer | Heiko Carstens <hca@linux.ibm.com> | 2023-01-04 17:54:50 +0100 |
| commit | b33d59fb37ddcb6ee65d4fa23cc3d58793d13c5b (patch) | |
| tree | 27f32dfe10f7a2080a628f61e44c9ec4a8d97aa6 /arch/s390/include/asm/uaccess.h | |
| parent | 739ad2e4e15b585a0eaf98b7bdee62b2dd9588c9 (diff) | |
| download | linux-stable-b33d59fb37ddcb6ee65d4fa23cc3d58793d13c5b.tar.gz linux-stable-b33d59fb37ddcb6ee65d4fa23cc3d58793d13c5b.tar.bz2 linux-stable-b33d59fb37ddcb6ee65d4fa23cc3d58793d13c5b.zip | |
s390/uaccess: avoid __ashlti3() call
__cmpxchg_user_key() uses 128 bit types which, depending on compiler
and config options, may lead to an __ashlti3() library call.
Get rid of that by simply casting the 128 bit values to 32 bit values.
Reported-by: kernel test robot <lkp@intel.com>
Suggested-by: Janis Schoetterl-Glausch <scgl@linux.ibm.com>
Fixes: 51098f0eb22e ("s390/cmpxchg: make loop condition for 1,2 byte cases precise")
Link: https://lore.kernel.org/all/4b96b112d5415d08a81d30657feec2c8c3000f7c.camel@linux.ibm.com/
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'arch/s390/include/asm/uaccess.h')
| -rw-r--r-- | arch/s390/include/asm/uaccess.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h index 7c10f594e747..8a8c64a678c4 100644 --- a/arch/s390/include/asm/uaccess.h +++ b/arch/s390/include/asm/uaccess.h @@ -407,8 +407,8 @@ static __always_inline int __cmpxchg_user_key(unsigned long address, void *uval, shift = (3 ^ (address & 3)) << 3; address ^= address & 3; - _old = (old & 0xff) << shift; - _new = (new & 0xff) << shift; + _old = ((unsigned int)old & 0xff) << shift; + _new = ((unsigned int)new & 0xff) << shift; mask = ~(0xff << shift); asm volatile( " spka 0(%[key])\n" @@ -455,8 +455,8 @@ static __always_inline int __cmpxchg_user_key(unsigned long address, void *uval, shift = (2 ^ (address & 2)) << 3; address ^= address & 2; - _old = (old & 0xffff) << shift; - _new = (new & 0xffff) << shift; + _old = ((unsigned int)old & 0xffff) << shift; + _new = ((unsigned int)new & 0xffff) << shift; mask = ~(0xffff << shift); asm volatile( " spka 0(%[key])\n" |