Merge branch 'akpm' (patches from Andrew)

[platform/kernel/linux-rpi.git] / kernel / locking / lockdep.c

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index f2d3bf4..2270ec6 100644 (file)
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -900,7 +900,7 @@ look_up_lock_class(const struct lockdep_map *lock, unsigned int subclass)
        if (DEBUG_LOCKS_WARN_ON(!irqs_disabled()))
                return NULL;
 
-       hlist_for_each_entry_rcu(class, hash_head, hash_entry) {
+       hlist_for_each_entry_rcu_notrace(class, hash_head, hash_entry) {
                if (class->key == key) {
                        /*
                         * Huh! same key, different name? Did someone trample
@@ -4683,7 +4683,7 @@ print_lock_invalid_wait_context(struct task_struct *curr,
 /*
  * Verify the wait_type context.
  *
- * This check validates we takes locks in the right wait-type order; that is it
+ * This check validates we take locks in the right wait-type order; that is it
  * ensures that we do not take mutexes inside spinlocks and do not attempt to
  * acquire spinlocks inside raw_spinlocks and the sort.
  *
@@ -5378,7 +5378,7 @@ int __lock_is_held(const struct lockdep_map *lock, int read)
                struct held_lock *hlock = curr->held_locks + i;
 
                if (match_held_lock(hlock, lock)) {
-                       if (read == -1 || hlock->read == read)
+                       if (read == -1 || !!hlock->read == read)
                                return LOCK_STATE_HELD;
 
                        return LOCK_STATE_NOT_HELD;