From: Ingo Molnar ide-floppy.c enables hardirqs in IRQ context. (build-tested) Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton --- drivers/ide/ide-floppy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/ide/ide-floppy.c~lock-validator-floppyc-irq-release-fix-fix-fix drivers/ide/ide-floppy.c --- devel/drivers/ide/ide-floppy.c~lock-validator-floppyc-irq-release-fix-fix-fix 2006-06-06 01:29:00.000000000 -0700 +++ devel-akpm/drivers/ide/ide-floppy.c 2006-06-06 01:29:00.000000000 -0700 @@ -839,7 +839,7 @@ static ide_startstop_t idefloppy_pc_intr "transferred\n", pc->actually_transferred); clear_bit(PC_DMA_IN_PROGRESS, &pc->flags); - local_irq_enable(); + local_irq_enable_in_hardirq(); if (status.b.check || test_bit(PC_DMA_ERROR, &pc->flags)) { /* Error detected */ _