diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2023-05-09 15:03:40 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2023-05-09 15:03:40 +0200 |
| commit | ff32fcca64437f679a2bf1c0a19d5def389a18e2 (patch) | |
| tree | 122863d5d6159b30fd6834cbe599f8ce1b9e8144 /include/asm-generic/cmpxchg.h | |
| parent | 79c87edd18ec49f5b6fb40175bd1b1fea9398fdb (diff) | |
| parent | ac9a78681b921877518763ba0e89202254349d1b (diff) | |
Merge drm/drm-next into drm-misc-next
Start the 6.5 release cycle.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'include/asm-generic/cmpxchg.h')
| -rw-r--r-- | include/asm-generic/cmpxchg.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-generic/cmpxchg.h b/include/asm-generic/cmpxchg.h index dca4419922a9..848de25fc4bf 100644 --- a/include/asm-generic/cmpxchg.h +++ b/include/asm-generic/cmpxchg.h @@ -32,7 +32,7 @@ unsigned long __generic_xchg(unsigned long x, volatile void *ptr, int size) #else local_irq_save(flags); ret = *(volatile u8 *)ptr; - *(volatile u8 *)ptr = x; + *(volatile u8 *)ptr = (x & 0xffu); local_irq_restore(flags); return ret; #endif /* __xchg_u8 */ @@ -43,7 +43,7 @@ unsigned long __generic_xchg(unsigned long x, volatile void *ptr, int size) #else local_irq_save(flags); ret = *(volatile u16 *)ptr; - *(volatile u16 *)ptr = x; + *(volatile u16 *)ptr = (x & 0xffffu); local_irq_restore(flags); return ret; #endif /* __xchg_u16 */ @@ -54,7 +54,7 @@ unsigned long __generic_xchg(unsigned long x, volatile void *ptr, int size) #else local_irq_save(flags); ret = *(volatile u32 *)ptr; - *(volatile u32 *)ptr = x; + *(volatile u32 *)ptr = (x & 0xffffffffu); local_irq_restore(flags); return ret; #endif /* __xchg_u32 */ |