summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorIngo Molnar2006-07-03 09:25:26 +0200
committerLinus Torvalds2006-07-04 00:27:09 +0200
commit60be6b9a41cb0da0df7a9f11486da56baebf04cd (patch)
tree26cb558d0d57183fdbf9136ad54b581328d6f016 /drivers/ide
parent[PATCH] lockdep: annotate enable_in_hardirq() (diff)
downloadkernel-qcow2-linux-60be6b9a41cb0da0df7a9f11486da56baebf04cd.tar.gz
kernel-qcow2-linux-60be6b9a41cb0da0df7a9f11486da56baebf04cd.tar.xz
kernel-qcow2-linux-60be6b9a41cb0da0df7a9f11486da56baebf04cd.zip
[PATCH] lockdep: annotate on-stack completions
lockdep needs to have the waitqueue lock initialized for on-stack waitqueues implicitly initialized by DECLARE_COMPLETION(). Annotate on-stack completions accordingly. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index d6bf1ec96322..fb6795236e76 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -1705,7 +1705,7 @@ int ide_do_drive_cmd (ide_drive_t *drive, struct request *rq, ide_action_t actio
{
unsigned long flags;
ide_hwgroup_t *hwgroup = HWGROUP(drive);
- DECLARE_COMPLETION(wait);
+ DECLARE_COMPLETION_ONSTACK(wait);
int where = ELEVATOR_INSERT_BACK, err;
int must_wait = (action == ide_wait || action == ide_head_wait);