mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
[PATCH] lockdep: annotate enable_in_hardirq()
Make use of local_irq_enable_in_hardirq() API to annotate places that enable hardirqs in hardirq context. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar <[email protected]> Signed-off-by: Arjan van de Ven <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
0a9da4bd8e
commit
366c7f554e
7 changed files with 9 additions and 9 deletions
|
|
@ -838,7 +838,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)
|
|||
"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 */
|
||||
|
|
|
|||
|
|
@ -693,7 +693,7 @@ static ide_startstop_t drive_cmd_intr (ide_drive_t *drive)
|
|||
u8 stat = hwif->INB(IDE_STATUS_REG);
|
||||
int retries = 10;
|
||||
|
||||
local_irq_enable();
|
||||
local_irq_enable_in_hardirq();
|
||||
if ((stat & DRQ_STAT) && args && args[3]) {
|
||||
u8 io_32bit = drive->io_32bit;
|
||||
drive->io_32bit = 0;
|
||||
|
|
@ -1286,7 +1286,7 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)
|
|||
if (masked_irq != IDE_NO_IRQ && hwif->irq != masked_irq)
|
||||
disable_irq_nosync(hwif->irq);
|
||||
spin_unlock(&ide_lock);
|
||||
local_irq_enable();
|
||||
local_irq_enable_in_hardirq();
|
||||
/* allow other IRQs while we start this request */
|
||||
startstop = start_request(drive, rq);
|
||||
spin_lock_irq(&ide_lock);
|
||||
|
|
@ -1631,7 +1631,7 @@ irqreturn_t ide_intr (int irq, void *dev_id, struct pt_regs *regs)
|
|||
spin_unlock(&ide_lock);
|
||||
|
||||
if (drive->unmask)
|
||||
local_irq_enable();
|
||||
local_irq_enable_in_hardirq();
|
||||
/* service this interrupt, may set handler for next interrupt */
|
||||
startstop = handler(drive);
|
||||
spin_lock_irq(&ide_lock);
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@ ide_startstop_t task_no_data_intr (ide_drive_t *drive)
|
|||
ide_hwif_t *hwif = HWIF(drive);
|
||||
u8 stat;
|
||||
|
||||
local_irq_enable();
|
||||
local_irq_enable_in_hardirq();
|
||||
if (!OK_STAT(stat = hwif->INB(IDE_STATUS_REG),READY_STAT,BAD_STAT)) {
|
||||
return ide_error(drive, "task_no_data_intr", stat);
|
||||
/* calls ide_end_drive_cmd */
|
||||
|
|
|
|||
Loading…
Reference in a new issue