Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5ef7ca0 authored by Kyle McMartin's avatar Kyle McMartin Committed by Linus Torvalds
Browse files

x86: spinlocks: define dummy __raw_spin_is_contended 



Architectures other than mips and x86 are not using ticket spinlocks.
Therefore, the contention on the lock is meaningless, since there is
nobody known to be waiting on it (arguably /fairly/ unfair locks).

Dummy it out to return 0 on other architectures.

Signed-off-by: default avatarKyle McMartin <kyle@redhat.com>
Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d5b56233

arch/mips/include/asm/spinlock.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ static inline int __raw_spin_is_contended(raw_spinlock_t *lock) 


	return (((counters >> 14) - counters) & 0x1fff) > 1;

}

#define __raw_spin_is_contended	__raw_spin_is_contended



static inline void __raw_spin_lock(raw_spinlock_t *lock)

{

arch/x86/include/asm/paravirt.h

+1 −0
Original line number Diff line number Diff line
@@ -1402,6 +1402,7 @@ static inline int __raw_spin_is_contended(struct raw_spinlock *lock) 
{

	return PVOP_CALL1(int, pv_lock_ops.spin_is_contended, lock);

}

#define __raw_spin_is_contended	__raw_spin_is_contended



static __always_inline void __raw_spin_lock(struct raw_spinlock *lock)

{

arch/x86/include/asm/spinlock.h

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ static inline int __raw_spin_is_contended(raw_spinlock_t *lock) 
{

	return __ticket_spin_is_contended(lock);

}

#define __raw_spin_is_contended	__raw_spin_is_contended



static __always_inline void __raw_spin_lock(raw_spinlock_t *lock)

{

include/linux/spinlock.h

+5 −0
Original line number Diff line number Diff line
@@ -124,7 +124,12 @@ do { \ 
#ifdef CONFIG_GENERIC_LOCKBREAK

#define spin_is_contended(lock) ((lock)->break_lock)

#else



#ifdef __raw_spin_is_contended

#define spin_is_contended(lock)	__raw_spin_is_contended(&(lock)->raw_lock)

#else

#define spin_is_contended(lock)	(((void)(lock), 0))

#endif /*__raw_spin_is_contended*/

#endif



/**