From: Ingo Molnar 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 Signed-off-by: Andrew Morton --- arch/x86_64/kernel/smpboot.c | 2 ++ block/ll_rw_blk.c | 2 +- drivers/ide/ide-io.c | 2 +- drivers/scsi/libata-core.c | 2 +- drivers/spi/spi.c | 2 +- kernel/kmod.c | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff -puN arch/x86_64/kernel/smpboot.c~lockdep-annotate-on-stack-completions arch/x86_64/kernel/smpboot.c --- a/arch/x86_64/kernel/smpboot.c~lockdep-annotate-on-stack-completions +++ a/arch/x86_64/kernel/smpboot.c @@ -775,6 +775,8 @@ static int __cpuinit do_boot_cpu(int cpu }; DECLARE_WORK(work, do_fork_idle, &c_idle); + lockdep_set_class(&c_idle.done.wait.lock, &waitqueue_lock_key); + /* allocate memory for gdts of secondary cpus. Hotplug is considered */ if (!cpu_gdt_descr[cpu].address && !(cpu_gdt_descr[cpu].address = get_zeroed_page(GFP_KERNEL))) { diff -puN block/ll_rw_blk.c~lockdep-annotate-on-stack-completions block/ll_rw_blk.c --- a/block/ll_rw_blk.c~lockdep-annotate-on-stack-completions +++ a/block/ll_rw_blk.c @@ -2521,7 +2521,7 @@ EXPORT_SYMBOL_GPL(blk_execute_rq_nowait) int blk_execute_rq(request_queue_t *q, struct gendisk *bd_disk, struct request *rq, int at_head) { - DECLARE_COMPLETION(wait); + DECLARE_COMPLETION_ONSTACK(wait); char sense[SCSI_SENSE_BUFFERSIZE]; int err = 0; diff -puN drivers/ide/ide-io.c~lockdep-annotate-on-stack-completions drivers/ide/ide-io.c --- a/drivers/ide/ide-io.c~lockdep-annotate-on-stack-completions +++ a/drivers/ide/ide-io.c @@ -1708,7 +1708,7 @@ int ide_do_drive_cmd (ide_drive_t *drive { 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); diff -puN drivers/scsi/libata-core.c~lockdep-annotate-on-stack-completions drivers/scsi/libata-core.c --- a/drivers/scsi/libata-core.c~lockdep-annotate-on-stack-completions +++ a/drivers/scsi/libata-core.c @@ -1001,7 +1001,7 @@ unsigned ata_exec_internal(struct ata_de struct ata_queued_cmd *qc; unsigned int tag, preempted_tag; u32 preempted_sactive, preempted_qc_active; - DECLARE_COMPLETION(wait); + DECLARE_COMPLETION_ONSTACK(wait); unsigned long flags; unsigned int err_mask; int rc; diff -puN drivers/spi/spi.c~lockdep-annotate-on-stack-completions drivers/spi/spi.c --- a/drivers/spi/spi.c~lockdep-annotate-on-stack-completions +++ a/drivers/spi/spi.c @@ -510,7 +510,7 @@ static void spi_complete(void *arg) */ int spi_sync(struct spi_device *spi, struct spi_message *message) { - DECLARE_COMPLETION(done); + DECLARE_COMPLETION_ONSTACK(done); int status; message->complete = spi_complete; diff -puN kernel/kmod.c~lockdep-annotate-on-stack-completions kernel/kmod.c --- a/kernel/kmod.c~lockdep-annotate-on-stack-completions +++ a/kernel/kmod.c @@ -233,7 +233,7 @@ static void __call_usermodehelper(void * int call_usermodehelper_keys(char *path, char **argv, char **envp, struct key *session_keyring, int wait) { - DECLARE_COMPLETION(done); + DECLARE_COMPLETION_ONSTACK(done); struct subprocess_info sub_info = { .complete = &done, .path = path, _