git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
[safe/jmp/linux-2.6]
/
kernel
/
wait.c
diff --git
a/kernel/wait.c
b/kernel/wait.c
index
42a2dbc
..
c4bd3d8
100644
(file)
--- a/
kernel/wait.c
+++ b/
kernel/wait.c
@@
-10,13
+10,14
@@
#include <linux/wait.h>
#include <linux/hash.h>
#include <linux/wait.h>
#include <linux/hash.h>
-void
init_waitqueue_head(wait_queue_head_t *q
)
+void
__init_waitqueue_head(wait_queue_head_t *q, struct lock_class_key *key
)
{
spin_lock_init(&q->lock);
{
spin_lock_init(&q->lock);
+ lockdep_set_class(&q->lock, key);
INIT_LIST_HEAD(&q->task_list);
}
INIT_LIST_HEAD(&q->task_list);
}
-EXPORT_SYMBOL(init_waitqueue_head);
+EXPORT_SYMBOL(
__
init_waitqueue_head);
void add_wait_queue(wait_queue_head_t *q, wait_queue_t *wait)
{
void add_wait_queue(wait_queue_head_t *q, wait_queue_t *wait)
{
@@
-154,7
+155,7
@@
void abort_exclusive_wait(wait_queue_head_t *q, wait_queue_t *wait,
if (!list_empty(&wait->task_list))
list_del_init(&wait->task_list);
else if (waitqueue_active(q))
if (!list_empty(&wait->task_list))
list_del_init(&wait->task_list);
else if (waitqueue_active(q))
- __wake_up_
common(q, mode, 1, 0
, key);
+ __wake_up_
locked_key(q, mode
, key);
spin_unlock_irqrestore(&q->lock, flags);
}
EXPORT_SYMBOL(abort_exclusive_wait);
spin_unlock_irqrestore(&q->lock, flags);
}
EXPORT_SYMBOL(abort_exclusive_wait);