From: Olof Johansson <olof@lixom.net>
To: Jens Axboe <jens.axboe@oracle.com>
Cc: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
mingo@elte.hu, linuxppc-dev@ozlabs.org
Subject: powerpc: Fix fallout from sg_page() changes
Date: Mon, 22 Oct 2007 23:09:48 -0500 [thread overview]
Message-ID: <20071023040948.GA19699@lixom.net> (raw)
In-Reply-To: <1193076664-13652-10-git-send-email-jens.axboe@oracle.com>
Fix fallout from 18dabf473e15850c0dbc8ff13ac1e2806d542c15:
In file included from include/linux/dma-mapping.h:52,
from drivers/base/dma-mapping.c:10:
include/asm/dma-mapping.h: In function 'dma_map_sg':
include/asm/dma-mapping.h:288: error: 'struct scatterlist' has no member named 'page'
include/asm/dma-mapping.h:288: error: 'struct scatterlist' has no member named 'page'
include/asm/dma-mapping.h:288: error: 'struct scatterlist' has no member named 'page'
include/asm/dma-mapping.h:289: error: 'struct scatterlist' has no member named 'page'
include/asm/dma-mapping.h:290: error: 'struct scatterlist' has no member named 'page'
include/asm/dma-mapping.h: In function 'dma_sync_sg_for_cpu':
include/asm/dma-mapping.h:331: error: 'struct scatterlist' has no member named 'page'
drivers/scsi/ps3rom.c: In function 'fetch_to_dev_buffer':
drivers/scsi/ps3rom.c:150: error: 'struct scatterlist' has no member named 'page'
Signed-off-by: Olof Johansson <olof@lixom.net>
diff --git a/include/asm-powerpc/dma-mapping.h b/include/asm-powerpc/dma-mapping.h
index 65be95d..ff52013 100644
--- a/include/asm-powerpc/dma-mapping.h
+++ b/include/asm-powerpc/dma-mapping.h
@@ -285,9 +285,9 @@ dma_map_sg(struct device *dev, struct scatterlist *sgl, int nents,
BUG_ON(direction == DMA_NONE);
for_each_sg(sgl, sg, nents, i) {
- BUG_ON(!sg->page);
- __dma_sync_page(sg->page, sg->offset, sg->length, direction);
- sg->dma_address = page_to_bus(sg->page) + sg->offset;
+ BUG_ON(!sg_page(sg));
+ __dma_sync_page(sg_page(sg), sg->offset, sg->length, direction);
+ sg->dma_address = page_to_bus(sg_page(sg)) + sg->offset;
}
return nents;
@@ -328,7 +328,7 @@ static inline void dma_sync_sg_for_cpu(struct device *dev,
BUG_ON(direction == DMA_NONE);
for_each_sg(sgl, sg, nents, i)
- __dma_sync_page(sg->page, sg->offset, sg->length, direction);
+ __dma_sync_page(sg_page(sg), sg->offset, sg->length, direction);
}
static inline void dma_sync_sg_for_device(struct device *dev,
@@ -341,7 +341,7 @@ static inline void dma_sync_sg_for_device(struct device *dev,
BUG_ON(direction == DMA_NONE);
for_each_sg(sgl, sg, nents, i)
- __dma_sync_page(sg->page, sg->offset, sg->length, direction);
+ __dma_sync_page(sg_page(sg), sg->offset, sg->length, direction);
}
static inline int dma_mapping_error(dma_addr_t dma_addr)
diff --git a/drivers/scsi/ps3rom.c b/drivers/scsi/ps3rom.c
index 03f19b8..17b4a7c 100644
--- a/drivers/scsi/ps3rom.c
+++ b/drivers/scsi/ps3rom.c
@@ -147,7 +147,7 @@ static int fetch_to_dev_buffer(struct scsi_cmnd *cmd, void *buf)
req_len = fin = 0;
scsi_for_each_sg(cmd, sgpnt, scsi_sg_count(cmd), k) {
- kaddr = kmap_atomic(sg_page(sgpnt->page), KM_IRQ0);
+ kaddr = kmap_atomic(sg_page(sgpnt), KM_IRQ0);
len = sgpnt->length;
if ((req_len + len) > buflen) {
len = buflen - req_len;
next prev parent reply other threads:[~2007-10-23 4:02 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-22 18:10 [PATCH 00/10] SG updates Jens Axboe
2007-10-22 18:10 ` [PATCH 01/10] [SG] Add helpers for manipulating SG entries Jens Axboe
2007-10-22 18:10 ` [PATCH 02/10] [SG] Update block layer to use sg helpers Jens Axboe
2007-10-23 5:13 ` Heiko Carstens
2007-10-23 5:16 ` Jens Axboe
2007-10-23 5:42 ` [PATCH] fix ll_rw_blk.c build on s390 Heiko Carstens
2007-10-23 5:44 ` [PATCH] net: fix xfrm build - missing scatterlist.h include Heiko Carstens
2007-10-23 7:28 ` Jens Axboe
2007-10-23 14:32 ` [PATCH 02/10] [SG] Update block layer to use sg helpers John Stoffel
2007-10-22 18:10 ` [PATCH 03/10] [SG] Update crypto/ to " Jens Axboe
2007-10-22 18:10 ` [PATCH 04/10] [SG] Update drivers to use " Jens Axboe
2007-10-23 6:28 ` Heiko Carstens
2007-10-23 7:14 ` Jens Axboe
2007-10-23 7:16 ` Heiko Carstens
2007-10-22 18:10 ` [PATCH 05/10] [SG] Update fs/ " Jens Axboe
2007-10-22 18:11 ` [PATCH 06/10] [SG] Update net/ " Jens Axboe
2007-10-23 10:44 ` Christian Borntraeger
2007-10-23 10:45 ` Jens Axboe
2007-10-22 18:11 ` [PATCH 07/10] [SG] Update swiotlb " Jens Axboe
2007-10-22 18:11 ` [PATCH 08/10] [SG] Update arch/ " Jens Axboe
2007-10-22 21:10 ` Benny Halevy
2007-10-23 7:26 ` Jens Axboe
2007-10-22 18:11 ` [PATCH 09/10] Change table chaining layout Jens Axboe
2007-10-22 19:39 ` Geert Uytterhoeven
2007-10-22 19:49 ` Linus Torvalds
2007-10-22 19:52 ` Jens Axboe
2007-10-22 20:16 ` Alan Cox
2007-10-22 20:38 ` Matt Mackall
2007-10-22 20:44 ` Linus Torvalds
2007-10-22 21:43 ` Alan Cox
2007-10-22 21:47 ` Linus Torvalds
2007-10-23 0:07 ` David Miller
2007-10-23 7:18 ` Geert Uytterhoeven
2007-10-23 9:29 ` Boaz Harrosh
2007-10-23 9:41 ` Jens Axboe
2007-10-23 9:50 ` Boaz Harrosh
2007-10-23 9:55 ` Jens Axboe
2007-10-23 10:23 ` Boaz Harrosh
2007-10-23 10:29 ` Jens Axboe
2007-10-23 15:22 ` Linus Torvalds
2007-10-24 8:05 ` Jens Axboe
2007-10-24 9:03 ` Geert Uytterhoeven
2007-10-24 9:12 ` Jens Axboe
2007-10-24 13:35 ` Olivier Galibert
2007-10-24 13:38 ` Jens Axboe
2007-10-24 13:45 ` Olivier Galibert
2007-10-24 15:16 ` Linus Torvalds
2007-10-25 8:40 ` Rusty Russell
2007-10-25 9:11 ` Jens Axboe
2007-10-25 11:54 ` Rusty Russell
2007-10-26 0:03 ` Rusty Russell
2007-10-25 15:40 ` Linus Torvalds
2007-10-25 16:03 ` Benny Halevy
2007-10-26 5:01 ` Paul Mackerras
2007-10-26 14:52 ` Linus Torvalds
2007-10-26 17:28 ` Jens Axboe
2007-11-05 6:11 ` [RFC PATCH 1/2] sg_ring instead of scatterlist chaining Rusty Russell
2007-11-05 6:15 ` [RFC PATCH 2/2] sg_ring instead of scatterlist chaining in virtio Rusty Russell
2007-11-05 16:40 ` [RFC PATCH 1/2] sg_ring instead of scatterlist chaining Randy Dunlap
2007-10-23 10:33 ` [PATCH 09/10] Change table chaining layout Ingo Molnar
2007-10-23 10:56 ` Jens Axboe
2007-10-23 11:27 ` Ingo Molnar
2007-10-23 19:23 ` Geert Uytterhoeven
2007-10-23 21:46 ` Jens Axboe
2007-10-24 6:56 ` Jens Axboe
2007-10-22 21:16 ` Benny Halevy
2007-10-22 21:21 ` Jeff Garzik
2007-10-22 21:47 ` Matt Mackall
2007-10-22 22:52 ` Alan Cox
2007-10-22 23:46 ` Matt Mackall
2007-10-23 0:11 ` Jeff Garzik
2007-10-23 4:09 ` Olof Johansson [this message]
2007-10-23 4:31 ` IB/ehca: Fix sg_page() fallout Olof Johansson
2007-10-23 5:05 ` Jens Axboe
2007-10-23 5:54 ` Olof Johansson
2007-10-23 7:12 ` Jens Axboe
2007-10-23 7:13 ` powerpc: Fix fallout from sg_page() changes Jens Axboe
2007-10-23 17:08 ` [PATCH 09/10] Change table chaining layout Boaz Harrosh
2007-10-23 18:33 ` Jens Axboe
2007-10-23 19:56 ` Andi Kleen
2007-10-23 20:20 ` Jens Axboe
2007-10-23 20:57 ` Andi Kleen
2007-10-23 21:44 ` Jens Axboe
2007-10-22 18:11 ` [PATCH 10/10] Add CONFIG_DEBUG_SG sg validation Jens Axboe
2007-10-23 14:48 ` [PATCH][SG] fix typo in ps3rom.c Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071023040948.GA19699@lixom.net \
--to=olof@lixom.net \
--cc=jens.axboe@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=mingo@elte.hu \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox