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

Commit 7b8067d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha 

Pull alpha update from Matt Turner:
 "A single patch for alpha, one that enables ARCH_USE_CMPXCHG_LOCKREF
  and offers around an 8% performance improvement on a little benchmark
  that you wrote"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
  alpha: select CONFIG_ARCH_USE_CMPXCHG_LOCKREF.
parents 9551bf29 8f8dcb3f

arch/alpha/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config ALPHA 
	default y

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO

	select ARCH_USE_CMPXCHG_LOCKREF

	select HAVE_AOUT

	select HAVE_IDE

	select HAVE_OPROFILE

arch/alpha/include/asm/spinlock.h

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ 
#define arch_spin_unlock_wait(x) \

		do { cpu_relax(); } while ((x)->lock)



static inline int arch_spin_value_unlocked(arch_spinlock_t lock)

{

        return lock.lock == 0;

}



static inline void arch_spin_unlock(arch_spinlock_t * lock)

{

	mb();