Merge branch 'v2.6.24-rc7-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep

* 'v2.6.24-rc7-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep:
  lockdep: more hardirq annotations for notify_die()
  lockdep: fix workqueue creation API lockdep interaction
  lockdep: fix internal double unlock during self-test

2 files changed, 11 insertions, 6 deletions

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 723bd9f92556..4335f12a27c6 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -2943,9 +2943,10 @@ void lockdep_free_key_range(void *start, unsigned long size)
         struct list_head *head;
         unsigned long flags;
         int i;
+        int locked;
 
         raw_local_irq_save(flags);
-        graph_lock();
+        locked = graph_lock();
 
         /*
          * Unhash all classes that were created by this module:
@@ -2959,7 +2960,8 @@ void lockdep_free_key_range(void *start, unsigned long size)
                                 zap_class(class);
         }
 
-        graph_unlock();
+        if (locked)
+                graph_unlock();
         raw_local_irq_restore(flags);
 }
 
@@ -2969,6 +2971,7 @@ void lockdep_reset_lock(struct lockdep_map *lock)
         struct list_head *head;
         unsigned long flags;
         int i, j;
+        int locked;
 
         raw_local_irq_save(flags);
 
@@ -2987,7 +2990,7 @@ void lockdep_reset_lock(struct lockdep_map *lock)
          * Debug check: in the end all mapped classes should
          * be gone.
          */
-        graph_lock();
+        locked = graph_lock();
         for (i = 0; i < CLASSHASH_SIZE; i++) {
                 head = classhash_table + i;
                 if (list_empty(head))
@@ -3000,7 +3003,8 @@ void lockdep_reset_lock(struct lockdep_map *lock)
                         }
                 }
         }
-        graph_unlock();
+        if (locked)
+                graph_unlock();
 
 out_restore:
         raw_local_irq_restore(flags);
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 52d5e7c9a8e6..8db0b597509e 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -722,7 +722,8 @@ static void start_workqueue_thread(struct cpu_workqueue_struct *cwq, int cpu)
 struct workqueue_struct *__create_workqueue_key(const char *name,
                                                 int singlethread,
                                                 int freezeable,
-                                                struct lock_class_key *key)
+                                                struct lock_class_key *key,
+                                                const char *lock_name)
 {
         struct workqueue_struct *wq;
         struct cpu_workqueue_struct *cwq;
@@ -739,7 +740,7 @@ struct workqueue_struct *__create_workqueue_key(const char *name,
         }
 
         wq->name = name;
-        lockdep_init_map(&wq->lockdep_map, name, key, 0);
+        lockdep_init_map(&wq->lockdep_map, lock_name, key, 0);
         wq->singlethread = singlethread;
         wq->freezeable = freezeable;
         INIT_LIST_HEAD(&wq->list);