rk: revert 20f3d0b+v3.0.66 to v3.0

[firefly-linux-kernel-4.4.55.git] / lib / plist.c

diff --git a/lib/plist.c b/lib/plist.c
index a0a4da489c22598748d7cea6da7e444d3b95f579..0ae7e64317260b7a1f8bb35d173aed24488ce433 100644 (file)
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -56,6 +56,11 @@ static void plist_check_list(struct list_head *top)
 
 static void plist_check_head(struct plist_head *head)
 {
+       WARN_ON(head != &test_head && !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));
        if (!plist_head_empty(head))
                plist_check_list(&plist_first(head)->prio_list);
        plist_check_list(&head->node_list);
@@ -175,7 +180,7 @@ static int  __init plist_test(void)
        unsigned int r = local_clock();
 
        printk(KERN_INFO "start plist test\n");
-       plist_head_init(&test_head);
+       plist_head_init(&test_head, NULL);
        for (i = 0; i < ARRAY_SIZE(test_node); i++)
                plist_node_init(test_node + i, 0);