Skip to content

Commit

Permalink
ide: use PageHighMem() instead of ifdefs in ide_pio_bytes()
Browse files Browse the repository at this point in the history
Use PageHighMem() instead of ifdefs in ide_pio_bytes()
(=> local IRQs won't be disabled when not necessary).

Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Mar 31, 2009
1 parent 7a00798 commit f2bc316
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions drivers/ide/ide-taskfile.c
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,7 @@ static void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
struct scatterlist *sg = hwif->sg_table;
struct scatterlist *cursg = cmd->cursg;
struct page *page;
#ifdef CONFIG_HIGHMEM
unsigned long flags;
#endif
unsigned int offset;
u8 *buf;

Expand All @@ -218,9 +216,9 @@ static void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
page = nth_page(page, (offset >> PAGE_SHIFT));
offset %= PAGE_SIZE;

#ifdef CONFIG_HIGHMEM
local_irq_save(flags);
#endif
if (PageHighMem(page))
local_irq_save(flags);

buf = kmap_atomic(page, KM_BIO_SRC_IRQ) + offset;

cmd->nleft -= nr_bytes;
Expand All @@ -238,9 +236,9 @@ static void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
hwif->tp_ops->input_data(drive, cmd, buf, nr_bytes);

kunmap_atomic(buf, KM_BIO_SRC_IRQ);
#ifdef CONFIG_HIGHMEM
local_irq_restore(flags);
#endif

if (PageHighMem(page))
local_irq_restore(flags);

len -= nr_bytes;
}
Expand Down

0 comments on commit f2bc316

Please sign in to comment.