diff options
| author |   Jean Delvare <khali@linux-fr.org> | 2009-06-23 04:12:24 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-08-07 10:42:55 -0700 |
| commit | a907905219dc83f501274d5d8c6d2aa2161ff8c3 (patch) | |
| tree | 05e0e87ca7440b8985b526ea3c81eaa94ace0030 /drivers/ide | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| download | linux-dev-a907905219dc83f501274d5d8c6d2aa2161ff8c3.tar.xz linux-dev-a907905219dc83f501274d5d8c6d2aa2161ff8c3.zip | |
IDE: Save a call to PageHighMem()
PageHighMem() isn't cheap so avoid calling it twice on the same page.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-taskfile.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index 75b85a8cd2d4..90e5c0deb0e0 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c @@ -236,6 +236,7 @@ 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; if (nr_bytes > PAGE_SIZE) nr_bytes = PAGE_SIZE; @@ -247,7 +248,8 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, page = nth_page(page, (offset >> PAGE_SHIFT)); offset %= PAGE_SIZE; - if (PageHighMem(page)) + page_is_high = PageHighMem(page); + if (page_is_high) local_irq_save(flags); buf = kmap_atomic(page, KM_BIO_SRC_IRQ) + offset; @@ -268,7 +270,7 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, kunmap_atomic(buf, KM_BIO_SRC_IRQ); - if (PageHighMem(page)) + if (page_is_high) local_irq_restore(flags); len -= nr_bytes; |