diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 16:43:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 16:43:21 -0700 |
| commit | 75b56ec294b074d70f8a676ab02611a3fea76cab (patch) | |
| tree | d5299adb43ac6fc8dcc50c3e438c7f0cdd452b1c /lib/plist.c | |
| parent | 6d16d6d9bb6f93e6f8506cfb3e91795d6443d54f (diff) | |
| parent | efbe2eee6dc0f179be84292bf269528b3ec365e9 (diff) | |
| download | op-kernel-dev-75b56ec294b074d70f8a676ab02611a3fea76cab.zip op-kernel-dev-75b56ec294b074d70f8a676ab02611a3fea76cab.tar.gz | |
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
lockdep: Fix lockdep_no_validate against IRQ states
mutex: Make mutex_destroy() an inline function
plist: Remove the need to supply locks to plist heads
lockup detector: Fix reference to the non-existent CONFIG_DETECT_SOFTLOCKUP option
Diffstat (limited to 'lib/plist.c')
| -rw-r--r-- | lib/plist.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/plist.c b/lib/plist.c index 0ae7e64..a0a4da4 100644 --- a/lib/plist.c +++ b/lib/plist.c @@ -56,11 +56,6 @@ 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); @@ -180,7 +175,7 @@ static int __init plist_test(void) unsigned int r = local_clock(); printk(KERN_INFO "start plist test\n"); - plist_head_init(&test_head, NULL); + plist_head_init(&test_head); for (i = 0; i < ARRAY_SIZE(test_node); i++) plist_node_init(test_node + i, 0); |
