]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'upstream/ticketlock-cleanup' into upstream/xen
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Fri, 26 Aug 2011 21:20:35 +0000 (14:20 -0700)
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Fri, 26 Aug 2011 21:20:35 +0000 (14:20 -0700)
commitfa40b015c1b500d22d17f7d20166f0070f23efa2
treebfab001784608ce8f7cc44f41b25cf4c48a7950d
parent3a82ec7e233fa799df4240cfab9e4c12a961edec
parent3dfc4f38180101117afca69f0910193bb9ec570f
Merge branch 'upstream/ticketlock-cleanup' into upstream/xen

* upstream/ticketlock-cleanup:
  x86/ticketlock: make __ticket_spin_trylock common
  x86/ticketlock: convert __ticket_spin_lock to use xadd()
  x86/ticketlock: convert spin loop to C
  x86/ticketlock: clean up types and accessors
  x86: use xadd helper more widely
  x86: add xadd helper macro
  x86/cmpxchg: unify cmpxchg into cmpxchg.h
  x86/cmpxchg: move 64-bit set64_bit() to match 32-bit
  x86/cmpxchg: move 32-bit __cmpxchg_wrong_size to match 64 bit.
  x86/cmpxchg: linux/alternative.h has LOCK_PREFIX
arch/x86/include/asm/atomic.h
arch/x86/include/asm/atomic64_64.h
arch/x86/include/asm/cmpxchg_32.h
arch/x86/include/asm/cmpxchg_64.h
arch/x86/include/asm/spinlock.h
arch/x86/include/asm/spinlock_types.h
arch/x86/include/asm/uv/uv_bau.h