* powerpc: Fix fallout from sg_page() changes [not found] ` <1193076664-13652-10-git-send-email-jens.axboe@oracle.com> @ 2007-10-23 4:09 ` Olof Johansson 2007-10-23 4:31 ` IB/ehca: Fix sg_page() fallout Olof Johansson 2007-10-23 7:13 ` powerpc: Fix fallout from sg_page() changes Jens Axboe 0 siblings, 2 replies; 6+ messages in thread From: Olof Johansson @ 2007-10-23 4:09 UTC (permalink / raw) To: Jens Axboe; +Cc: linuxppc-dev, mingo, torvalds, linux-kernel 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; ^ permalink raw reply related [flat|nested] 6+ messages in thread
* IB/ehca: Fix sg_page() fallout 2007-10-23 4:09 ` powerpc: Fix fallout from sg_page() changes Olof Johansson @ 2007-10-23 4:31 ` Olof Johansson 2007-10-23 5:05 ` Jens Axboe 2007-10-23 7:13 ` powerpc: Fix fallout from sg_page() changes Jens Axboe 1 sibling, 1 reply; 6+ messages in thread From: Olof Johansson @ 2007-10-23 4:31 UTC (permalink / raw) To: Jens Axboe; +Cc: linuxppc-dev, Joachim Fenkes, torvalds, linux-kernel More fallout from sg_page changes, found with powerpc allyesconfig: drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_set_pagebuf_user1': drivers/infiniband/hw/ehca/ehca_mrmw.c:1779: error: 'struct scatterlist' has no member named 'page' drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_check_kpages_per_ate': drivers/infiniband/hw/ehca/ehca_mrmw.c:1835: error: 'struct scatterlist' has no member named 'page' drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_set_pagebuf_user2': drivers/infiniband/hw/ehca/ehca_mrmw.c:1870: error: 'struct scatterlist' has no member named 'page' Signed-off-by: Olof Johansson <olof@lixom.net> diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c index da88738..a3037f3 100644 --- a/drivers/infiniband/hw/ehca/ehca_mrmw.c +++ b/drivers/infiniband/hw/ehca/ehca_mrmw.c @@ -1776,7 +1776,7 @@ static int ehca_set_pagebuf_user1(struct ehca_mr_pginfo *pginfo, list_for_each_entry_continue( chunk, (&(pginfo->u.usr.region->chunk_list)), list) { for (i = pginfo->u.usr.next_nmap; i < chunk->nmap; ) { - pgaddr = page_to_pfn(chunk->page_list[i].page) + pgaddr = page_to_pfn(sg_page(chunk->page_list[i])) << PAGE_SHIFT ; *kpage = phys_to_abs(pgaddr + (pginfo->next_hwpage * @@ -1832,7 +1832,7 @@ static int ehca_check_kpages_per_ate(struct scatterlist *page_list, { int t; for (t = start_idx; t <= end_idx; t++) { - u64 pgaddr = page_to_pfn(page_list[t].page) << PAGE_SHIFT; + u64 pgaddr = page_to_pfn(sg_page(page_list[t])) << PAGE_SHIFT; ehca_gen_dbg("chunk_page=%lx value=%016lx", pgaddr, *(u64 *)abs_to_virt(phys_to_abs(pgaddr))); if (pgaddr - PAGE_SIZE != *prev_pgaddr) { @@ -1867,7 +1867,7 @@ static int ehca_set_pagebuf_user2(struct ehca_mr_pginfo *pginfo, chunk, (&(pginfo->u.usr.region->chunk_list)), list) { for (i = pginfo->u.usr.next_nmap; i < chunk->nmap; ) { if (nr_kpages == kpages_per_hwpage) { - pgaddr = ( page_to_pfn(chunk->page_list[i].page) + pgaddr = ( page_to_pfn(sg_page(chunk->page_list[i])) << PAGE_SHIFT ); *kpage = phys_to_abs(pgaddr); if ( !(*kpage) ) { ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: IB/ehca: Fix sg_page() fallout 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 0 siblings, 1 reply; 6+ messages in thread From: Jens Axboe @ 2007-10-23 5:05 UTC (permalink / raw) To: Olof Johansson; +Cc: linuxppc-dev, Joachim Fenkes, torvalds, linux-kernel On Mon, Oct 22 2007, Olof Johansson wrote: > More fallout from sg_page changes, found with powerpc allyesconfig: > > drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_set_pagebuf_user1': > drivers/infiniband/hw/ehca/ehca_mrmw.c:1779: error: 'struct scatterlist' has no member named 'page' > drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_check_kpages_per_ate': > drivers/infiniband/hw/ehca/ehca_mrmw.c:1835: error: 'struct scatterlist' has no member named 'page' > drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_set_pagebuf_user2': > drivers/infiniband/hw/ehca/ehca_mrmw.c:1870: error: 'struct scatterlist' has no member named 'page' Thanks a lot Olof, applied both fixups! -- Jens Axboe ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: IB/ehca: Fix sg_page() fallout 2007-10-23 5:05 ` Jens Axboe @ 2007-10-23 5:54 ` Olof Johansson 2007-10-23 7:12 ` Jens Axboe 0 siblings, 1 reply; 6+ messages in thread From: Olof Johansson @ 2007-10-23 5:54 UTC (permalink / raw) To: Jens Axboe; +Cc: linuxppc-dev, Joachim Fenkes, torvalds, linux-kernel More fallout from sg_page changes: drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_set_pagebuf_user1': drivers/infiniband/hw/ehca/ehca_mrmw.c:1779: error: 'struct scatterlist' has no member named 'page' drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_check_kpages_per_ate': drivers/infiniband/hw/ehca/ehca_mrmw.c:1835: error: 'struct scatterlist' has no member named 'page' drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_set_pagebuf_user2': drivers/infiniband/hw/ehca/ehca_mrmw.c:1870: error: 'struct scatterlist' has no member named 'page' Signed-off-by: Olof Johansson <olof@lixom.net> --- On Tue, Oct 23, 2007 at 07:05:12AM +0200, Jens Axboe wrote: > On Mon, Oct 22 2007, Olof Johansson wrote: > > More fallout from sg_page changes, found with powerpc allyesconfig: > > > > drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_set_pagebuf_user1': > > drivers/infiniband/hw/ehca/ehca_mrmw.c:1779: error: 'struct scatterlist' has no member named 'page' > > drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_check_kpages_per_ate': > > drivers/infiniband/hw/ehca/ehca_mrmw.c:1835: error: 'struct scatterlist' has no member named 'page' > > drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_set_pagebuf_user2': > > drivers/infiniband/hw/ehca/ehca_mrmw.c:1870: error: 'struct scatterlist' has no member named 'page' > > Thanks a lot Olof, applied both fixups! I messed up the second fix. :( please replace with this. -Olof diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c index da88738..ead7230 100644 --- a/drivers/infiniband/hw/ehca/ehca_mrmw.c +++ b/drivers/infiniband/hw/ehca/ehca_mrmw.c @@ -1776,7 +1776,7 @@ static int ehca_set_pagebuf_user1(struct ehca_mr_pginfo *pginfo, list_for_each_entry_continue( chunk, (&(pginfo->u.usr.region->chunk_list)), list) { for (i = pginfo->u.usr.next_nmap; i < chunk->nmap; ) { - pgaddr = page_to_pfn(chunk->page_list[i].page) + pgaddr = page_to_pfn(sg_page(&chunk->page_list[i])) << PAGE_SHIFT ; *kpage = phys_to_abs(pgaddr + (pginfo->next_hwpage * @@ -1832,7 +1832,7 @@ static int ehca_check_kpages_per_ate(struct scatterlist *page_list, { int t; for (t = start_idx; t <= end_idx; t++) { - u64 pgaddr = page_to_pfn(page_list[t].page) << PAGE_SHIFT; + u64 pgaddr = page_to_pfn(sg_page(&page_list[t])) << PAGE_SHIFT; ehca_gen_dbg("chunk_page=%lx value=%016lx", pgaddr, *(u64 *)abs_to_virt(phys_to_abs(pgaddr))); if (pgaddr - PAGE_SIZE != *prev_pgaddr) { @@ -1867,7 +1867,7 @@ static int ehca_set_pagebuf_user2(struct ehca_mr_pginfo *pginfo, chunk, (&(pginfo->u.usr.region->chunk_list)), list) { for (i = pginfo->u.usr.next_nmap; i < chunk->nmap; ) { if (nr_kpages == kpages_per_hwpage) { - pgaddr = ( page_to_pfn(chunk->page_list[i].page) + pgaddr = ( page_to_pfn(sg_page(&chunk->page_list[i])) << PAGE_SHIFT ); *kpage = phys_to_abs(pgaddr); if ( !(*kpage) ) { ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: IB/ehca: Fix sg_page() fallout 2007-10-23 5:54 ` Olof Johansson @ 2007-10-23 7:12 ` Jens Axboe 0 siblings, 0 replies; 6+ messages in thread From: Jens Axboe @ 2007-10-23 7:12 UTC (permalink / raw) To: Olof Johansson; +Cc: linuxppc-dev, Joachim Fenkes, torvalds, linux-kernel On Tue, Oct 23 2007, Olof Johansson wrote: > > More fallout from sg_page changes: > > drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_set_pagebuf_user1': > drivers/infiniband/hw/ehca/ehca_mrmw.c:1779: error: 'struct scatterlist' has no member named 'page' > drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_check_kpages_per_ate': > drivers/infiniband/hw/ehca/ehca_mrmw.c:1835: error: 'struct scatterlist' has no member named 'page' > drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_set_pagebuf_user2': > drivers/infiniband/hw/ehca/ehca_mrmw.c:1870: error: 'struct scatterlist' has no member named 'page' > > > Signed-off-by: Olof Johansson <olof@lixom.net> > > > --- > > On Tue, Oct 23, 2007 at 07:05:12AM +0200, Jens Axboe wrote: > > On Mon, Oct 22 2007, Olof Johansson wrote: > > > More fallout from sg_page changes, found with powerpc allyesconfig: > > > > > > drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_set_pagebuf_user1': > > > drivers/infiniband/hw/ehca/ehca_mrmw.c:1779: error: 'struct scatterlist' has no member named 'page' > > > drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_check_kpages_per_ate': > > > drivers/infiniband/hw/ehca/ehca_mrmw.c:1835: error: 'struct scatterlist' has no member named 'page' > > > drivers/infiniband/hw/ehca/ehca_mrmw.c: In function 'ehca_set_pagebuf_user2': > > > drivers/infiniband/hw/ehca/ehca_mrmw.c:1870: error: 'struct scatterlist' has no member named 'page' > > > > Thanks a lot Olof, applied both fixups! > > I messed up the second fix. :( please replace with this. No problem, applied. -- Jens Axboe ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: powerpc: Fix fallout from sg_page() changes 2007-10-23 4:09 ` powerpc: Fix fallout from sg_page() changes Olof Johansson 2007-10-23 4:31 ` IB/ehca: Fix sg_page() fallout Olof Johansson @ 2007-10-23 7:13 ` Jens Axboe 1 sibling, 0 replies; 6+ messages in thread From: Jens Axboe @ 2007-10-23 7:13 UTC (permalink / raw) To: Olof Johansson; +Cc: linuxppc-dev, mingo, torvalds, linux-kernel On Mon, Oct 22 2007, Olof Johansson wrote: > 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' Applied. -- Jens Axboe ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2007-10-23 7:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1193076664-13652-1-git-send-email-jens.axboe@oracle.com>
[not found] ` <1193076664-13652-10-git-send-email-jens.axboe@oracle.com>
2007-10-23 4:09 ` powerpc: Fix fallout from sg_page() changes Olof Johansson
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
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).