diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-07-28 13:18:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-07-28 13:18:01 +0200 |
| commit | e89d4ca1df630378bde3e36c42001b755b0044fe (patch) | |
| tree | d953ccecb8365acab65d0075e674f7e9a9bd9880 /arch/parisc/include/asm/cmpxchg.h | |
| parent | x86/perf: Fix a typo (diff) | |
| parent | Linux 5.8-rc7 (diff) | |
| download | linux-e89d4ca1df630378bde3e36c42001b755b0044fe.tar.xz linux-e89d4ca1df630378bde3e36c42001b755b0044fe.zip | |
Merge tag 'v5.8-rc7' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/parisc/include/asm/cmpxchg.h')
| -rw-r--r-- | arch/parisc/include/asm/cmpxchg.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/parisc/include/asm/cmpxchg.h b/arch/parisc/include/asm/cmpxchg.h index ab5c215cf46c..068958575871 100644 --- a/arch/parisc/include/asm/cmpxchg.h +++ b/arch/parisc/include/asm/cmpxchg.h @@ -60,6 +60,7 @@ extern void __cmpxchg_called_with_bad_pointer(void); extern unsigned long __cmpxchg_u32(volatile unsigned int *m, unsigned int old, unsigned int new_); extern u64 __cmpxchg_u64(volatile u64 *ptr, u64 old, u64 new_); +extern u8 __cmpxchg_u8(volatile u8 *ptr, u8 old, u8 new_); /* don't worry...optimizer will get rid of most of this */ static inline unsigned long @@ -71,6 +72,7 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new_, int size) #endif case 4: return __cmpxchg_u32((unsigned int *)ptr, (unsigned int)old, (unsigned int)new_); + case 1: return __cmpxchg_u8((u8 *)ptr, (u8)old, (u8)new_); } __cmpxchg_called_with_bad_pointer(); return old; |