Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36e8e578 authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] lockdep: annotate idescsi_pc_intr() 



idescsi_pc_intr() uses local_irq_enable() in IRQ context: annotate it.

(this has no effect on kernels with lockdep disabled.  On kernels with lockdep
enabled this means that we wont actually disable interrupts, and the warning
message will go away as well.)

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4e54bdaa

drivers/scsi/ide-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive) 
		/* No more interrupts */

		if (test_bit(IDESCSI_LOG_CMD, &scsi->log))

			printk (KERN_INFO "Packet command completed, %d bytes transferred\n", pc->actually_transferred);

		local_irq_enable();

		local_irq_enable_in_hardirq();

		if (status.b.check)

			rq->errors++;

		idescsi_end_request (drive, 1, 0);