| Message ID | 20180504142446.30525-4-bigeasy@linutronix.de |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | avoid disabling interrupts where it is not required | expand |
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Fri, 4 May 2018 16:24:45 +0200 > ide_pio_bytes() disables interrupts around kmap_atomic(). This is a > leftover from the old kmap_atomic() implementation which relied on fixed > mapping slots, so the caller had to make sure that the same slot could not > be reused from an interrupting context. > > kmap_atomic() was changed to dynamic slots long ago and commit 1ec9c5ddc17a > ("include/linux/highmem.h: remove the second argument of k[un]map_atomic()") > removed the slot assignements, but the callers were not checked for now > redundant interrupt disabling. > > Remove the conditional interrupt disable. > > Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Acked-by: David S. Miller <davem@davemloft.net> -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index abe0822dd429..49f9b4739779 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c @@ -237,7 +237,6 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, while (len) { unsigned nr_bytes = min(len, cursg->length - cmd->cursg_ofs); - int page_is_high; page = sg_page(cursg); offset = cursg->offset + cmd->cursg_ofs; @@ -248,10 +247,6 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, nr_bytes = min_t(unsigned, nr_bytes, (PAGE_SIZE - offset)); - page_is_high = PageHighMem(page); - if (page_is_high) - local_irq_save(flags); - buf = kmap_atomic(page) + offset; cmd->nleft -= nr_bytes; @@ -270,9 +265,6 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, kunmap_atomic(buf); - if (page_is_high) - local_irq_restore(flags); - len -= nr_bytes; } }
ide_pio_bytes() disables interrupts around kmap_atomic(). This is a leftover from the old kmap_atomic() implementation which relied on fixed mapping slots, so the caller had to make sure that the same slot could not be reused from an interrupting context. kmap_atomic() was changed to dynamic slots long ago and commit 1ec9c5ddc17a ("include/linux/highmem.h: remove the second argument of k[un]map_atomic()") removed the slot assignements, but the callers were not checked for now redundant interrupt disabling. Remove the conditional interrupt disable. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- drivers/ide/ide-taskfile.c | 8 -------- 1 file changed, 8 deletions(-)