From 3cd3d8b966b256ad8d50bd6bbe715ee6be7d08b2 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Mon, 11 Dec 2006 11:05:53 -0500 Subject: [PATCH] --- yaml --- r: 44621 b: refs/heads/master c: da02d2a16ef3accd625f9e6e7bf83bb0f946ff62 h: refs/heads/master i: 44619: 036c407cc57bd4ddd019080506dcee15caaa5cef v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-scsi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 51bd661a57ed..692a2aba2baa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fae07dc389bc32a3638b9d4c61dd3738ca3fb61d +refs/heads/master: da02d2a16ef3accd625f9e6e7bf83bb0f946ff62 diff --git a/trunk/drivers/ata/libata-scsi.c b/trunk/drivers/ata/libata-scsi.c index 664e1377b54c..a4790be41d1c 100644 --- a/trunk/drivers/ata/libata-scsi.c +++ b/trunk/drivers/ata/libata-scsi.c @@ -1539,7 +1539,7 @@ static unsigned int ata_scsi_rbuf_get(struct scsi_cmnd *cmd, u8 **buf_out) struct scatterlist *sg; sg = (struct scatterlist *) cmd->request_buffer; - buf = kmap_atomic(sg->page, KM_USER0) + sg->offset; + buf = kmap_atomic(sg->page, KM_IRQ0) + sg->offset; buflen = sg->length; } else { buf = cmd->request_buffer; @@ -1567,7 +1567,7 @@ static inline void ata_scsi_rbuf_put(struct scsi_cmnd *cmd, u8 *buf) struct scatterlist *sg; sg = (struct scatterlist *) cmd->request_buffer; - kunmap_atomic(buf - sg->offset, KM_USER0); + kunmap_atomic(buf - sg->offset, KM_IRQ0); } }