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

Pull core/locking changes from Ingo Molnar:
 "Main changes:

   - another mutex optimization, from Davidlohr Bueso

   - improved lglock lockdep tracking, from Michel Lespinasse

   - [ assorted smaller updates, improvements, cleanups. ]"

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  generic-ipi/locking: Fix misleading smp_call_function_any() description
  hung_task debugging: Print more info when reporting the problem
  mutex: Avoid label warning when !CONFIG_MUTEX_SPIN_ON_OWNER
  mutex: Do not unnecessarily deal with waiters
  mutex: Fix/document access-once assumption in mutex_can_spin_on_owner()
  lglock: Update lockdep annotations to report recursive local locks
  lockdep: Introduce lock_acquire_exclusive()/shared() helper macros

1 files changed, 6 insertions, 6 deletions

diff --git a/kernel/lglock.c b/kernel/lglock.c
index 6535a667a5a7..86ae2aebf004 100644
--- a/kernel/lglock.c
+++ b/kernel/lglock.c
@@ -21,7 +21,7 @@ void lg_local_lock(struct lglock *lg)
         arch_spinlock_t *lock;
 
         preempt_disable();
-        rwlock_acquire_read(&lg->lock_dep_map, 0, 0, _RET_IP_);
+        lock_acquire_shared(&lg->lock_dep_map, 0, 0, NULL, _RET_IP_);
         lock = this_cpu_ptr(lg->lock);
         arch_spin_lock(lock);
 }
@@ -31,7 +31,7 @@ void lg_local_unlock(struct lglock *lg)
 {
         arch_spinlock_t *lock;
 
-        rwlock_release(&lg->lock_dep_map, 1, _RET_IP_);
+        lock_release(&lg->lock_dep_map, 1, _RET_IP_);
         lock = this_cpu_ptr(lg->lock);
         arch_spin_unlock(lock);
         preempt_enable();
@@ -43,7 +43,7 @@ void lg_local_lock_cpu(struct lglock *lg, int cpu)
         arch_spinlock_t *lock;
 
         preempt_disable();
-        rwlock_acquire_read(&lg->lock_dep_map, 0, 0, _RET_IP_);
+        lock_acquire_shared(&lg->lock_dep_map, 0, 0, NULL, _RET_IP_);
         lock = per_cpu_ptr(lg->lock, cpu);
         arch_spin_lock(lock);
 }
@@ -53,7 +53,7 @@ void lg_local_unlock_cpu(struct lglock *lg, int cpu)
 {
         arch_spinlock_t *lock;
 
-        rwlock_release(&lg->lock_dep_map, 1, _RET_IP_);
+        lock_release(&lg->lock_dep_map, 1, _RET_IP_);
         lock = per_cpu_ptr(lg->lock, cpu);
         arch_spin_unlock(lock);
         preempt_enable();
@@ -65,7 +65,7 @@ void lg_global_lock(struct lglock *lg)
         int i;
 
         preempt_disable();
-        rwlock_acquire(&lg->lock_dep_map, 0, 0, _RET_IP_);
+        lock_acquire_exclusive(&lg->lock_dep_map, 0, 0, NULL, _RET_IP_);
         for_each_possible_cpu(i) {
                 arch_spinlock_t *lock;
                 lock = per_cpu_ptr(lg->lock, i);
@@ -78,7 +78,7 @@ void lg_global_unlock(struct lglock *lg)
 {
         int i;
 
-        rwlock_release(&lg->lock_dep_map, 1, _RET_IP_);
+        lock_release(&lg->lock_dep_map, 1, _RET_IP_);
         for_each_possible_cpu(i) {
                 arch_spinlock_t *lock;
                 lock = per_cpu_ptr(lg->lock, i);