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

Commit b798df09 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by H. Peter Anvin
Browse files

x86, ticketlock: Collapse a layer of functions 



Now that the paravirtualization layer doesn't exist at the spinlock
level any more, we can collapse the __ticket_ functions into the arch_
functions.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy@goop.org>
Link: http://lkml.kernel.org/r/1376058122-8248-4-git-send-email-raghavendra.kt@linux.vnet.ibm.com


Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tested-by: default avatarAttilio Rao <attilio.rao@citrix.com>
Signed-off-by: default avatarRaghavendra K T <raghavendra.kt@linux.vnet.ibm.com>
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 8db73266

arch/x86/include/asm/spinlock.h

+5 −30
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static __always_inline void __ticket_unlock_kick(struct arch_spinlock *lock, 
 * in the high part, because a wide xadd increment of the low part would carry

 * up and contaminate the high part.

 */

static __always_inline void __ticket_spin_lock(struct arch_spinlock *lock)

static __always_inline void arch_spin_lock(struct arch_spinlock *lock)

{

	register struct __raw_tickets inc = { .tail = 1 };
@@ -96,7 +96,7 @@ static __always_inline void __ticket_spin_lock(struct arch_spinlock *lock) 
out:	barrier();	/* make sure nothing creeps before the lock is taken */

}



static __always_inline int __ticket_spin_trylock(arch_spinlock_t *lock)

static __always_inline int arch_spin_trylock(arch_spinlock_t *lock)

{

	arch_spinlock_t old, new;
@@ -110,7 +110,7 @@ static __always_inline int __ticket_spin_trylock(arch_spinlock_t *lock) 
	return cmpxchg(&lock->head_tail, old.head_tail, new.head_tail) == old.head_tail;

}



static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)

static __always_inline void arch_spin_unlock(arch_spinlock_t *lock)

{

	__ticket_t next = lock->tickets.head + 1;
@@ -118,46 +118,21 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock) 
	__ticket_unlock_kick(lock, next);

}



static inline int __ticket_spin_is_locked(arch_spinlock_t *lock)

static inline int arch_spin_is_locked(arch_spinlock_t *lock)

{

	struct __raw_tickets tmp = ACCESS_ONCE(lock->tickets);



	return tmp.tail != tmp.head;

}



static inline int __ticket_spin_is_contended(arch_spinlock_t *lock)

static inline int arch_spin_is_contended(arch_spinlock_t *lock)

{

	struct __raw_tickets tmp = ACCESS_ONCE(lock->tickets);



	return (__ticket_t)(tmp.tail - tmp.head) > 1;

}



static inline int arch_spin_is_locked(arch_spinlock_t *lock)

{

	return __ticket_spin_is_locked(lock);

}



static inline int arch_spin_is_contended(arch_spinlock_t *lock)

{

	return __ticket_spin_is_contended(lock);

}

#define arch_spin_is_contended	arch_spin_is_contended



static __always_inline void arch_spin_lock(arch_spinlock_t *lock)

{

	__ticket_spin_lock(lock);

}



static __always_inline int arch_spin_trylock(arch_spinlock_t *lock)

{

	return __ticket_spin_trylock(lock);

}



static __always_inline void arch_spin_unlock(arch_spinlock_t *lock)

{

	__ticket_spin_unlock(lock);

}



static __always_inline void arch_spin_lock_flags(arch_spinlock_t *lock,

						  unsigned long flags)

{