Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull core locking updates from Ingo Molnar:
 "The main updates in this cycle were:

   - mutex MCS refactoring finishing touches: improve comments, refactor
     and clean up code, reduce debug data structure footprint, etc.

   - qrwlock finishing touches: remove old code, self-test updates.

   - small rwsem optimization

   - various smaller fixes/cleanups"

* 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/lockdep: Revert qrwlock recusive stuff
  locking/rwsem: Avoid double checking before try acquiring write lock
  locking/rwsem: Move EXPORT_SYMBOL() lines to follow function definition
  locking/rwlock, x86: Delete unused asm/rwlock.h and rwlock.S
  locking/rwlock, x86: Clean up asm/spinlock*.h to remove old rwlock code
  locking/semaphore: Resolve some shadow warnings
  locking/selftest: Support queued rwlock
  locking/lockdep: Restrict the use of recursive read_lock() with qrwlock
  locking/spinlocks: Always evaluate the second argument of spin_lock_nested()
  locking/Documentation: Update locking/mutex-design.txt disadvantages
  locking/Documentation: Move locking related docs into Documentation/locking/
  locking/mutexes: Use MUTEX_SPIN_ON_OWNER when appropriate
  locking/mutexes: Refactor optimistic spinning code
  locking/mcs: Remove obsolete comment
  locking/mutexes: Document quick lock release when unlocking
  locking/mutexes: Standardize arguments in lock/unlock slowpaths
  locking: Remove deprecated smp_mb__() barriers

1 files changed, 0 insertions, 44 deletions

diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
deleted file mode 100644
index 1cad22139c88..000000000000
--- a/arch/x86/lib/rwlock.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Slow paths of read/write spinlocks. */
-
-#include <linux/linkage.h>
-#include <asm/alternative-asm.h>
-#include <asm/frame.h>
-#include <asm/rwlock.h>
-
-#ifdef CONFIG_X86_32
-# define __lock_ptr eax
-#else
-# define __lock_ptr rdi
-#endif
-
-ENTRY(__write_lock_failed)
-        CFI_STARTPROC
-        FRAME
-0:      LOCK_PREFIX
-        WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
-1:      rep; nop
-        cmpl    $WRITE_LOCK_CMP, (%__lock_ptr)
-        jne     1b
-        LOCK_PREFIX
-        WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
-        jnz     0b
-        ENDFRAME
-        ret
-        CFI_ENDPROC
-END(__write_lock_failed)
-
-ENTRY(__read_lock_failed)
-        CFI_STARTPROC
-        FRAME
-0:      LOCK_PREFIX
-        READ_LOCK_SIZE(inc) (%__lock_ptr)
-1:      rep; nop
-        READ_LOCK_SIZE(cmp) $1, (%__lock_ptr)
-        js      1b
-        LOCK_PREFIX
-        READ_LOCK_SIZE(dec) (%__lock_ptr)
-        js      0b
-        ENDFRAME
-        ret
-        CFI_ENDPROC
-END(__read_lock_failed)