Commit 40c60ac3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc-5.8-2' of... 

Merge branch 'parisc-5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux into master

Pull parisc fixes from Helge Deller:
 "Two fixes:

   - Add the cmpxchg() function for pointers to u8 values. This fixes a
     kernel linking error when building the tusb1210 driver (from Liam
     Beguin).

   - Add a define for atomic64_set_release() to fix CPU soft lockups
     which happen because of missing unlocks while processing bit
     operations (from John David Anglin)"

* 'parisc-5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Add atomic64_set_release() define to avoid CPU soft lockups
  parisc: add support for cmpxchg on u8 pointers
parents 1ada9010 be6577af

arch/parisc/include/asm/atomic.h

+2 −0
Original line number Diff line number Diff line
@@ -212,6 +212,8 @@ atomic64_set(atomic64_t *v, s64 i) 
	_atomic_spin_unlock_irqrestore(v, flags);

}



#define atomic64_set_release(v, i)	atomic64_set((v), (i))



static __inline__ s64

atomic64_read(const atomic64_t *v)

{

arch/parisc/include/asm/cmpxchg.h

+2 −0
Original line number Diff line number Diff line
@@ -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;

arch/parisc/lib/bitops.c

+12 −0
Original line number Diff line number Diff line
@@ -79,3 +79,15 @@ unsigned long __cmpxchg_u32(volatile unsigned int *ptr, unsigned int old, unsign 
	_atomic_spin_unlock_irqrestore(ptr, flags);

	return (unsigned long)prev;

}



u8 __cmpxchg_u8(volatile u8 *ptr, u8 old, u8 new)

{

	unsigned long flags;

	u8 prev;



	_atomic_spin_lock_irqsave(ptr, flags);

	if ((prev = *ptr) == old)

		*ptr = new;

	_atomic_spin_unlock_irqrestore(ptr, flags);

	return prev;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE