Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/plist.c b/lib/plist.c
index d6c64a824e1d..1471988d9190 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -54,9 +54,11 @@ static void plist_check_list(struct list_head *top)
 
 static void plist_check_head(struct plist_head *head)
 {
-        WARN_ON(!head->lock);
-        if (head->lock)
-                WARN_ON_SMP(!spin_is_locked(head->lock));
+        WARN_ON(!head->rawlock && !head->spinlock);
+        if (head->rawlock)
+                WARN_ON_SMP(!raw_spin_is_locked(head->rawlock));
+        if (head->spinlock)
+                WARN_ON_SMP(!spin_is_locked(head->spinlock));
         plist_check_list(&head->prio_list);
         plist_check_list(&head->node_list);
 }