diff options
author | Olof Johansson <olof@lixom.net> | 2007-10-23 03:12:52 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2007-10-23 03:12:52 -0400 |
commit | c8ac5a7309c5060e27caf69403072f54e008ee54 (patch) | |
tree | 8163455f61cbbfc236f03d10125b8dba904b80c7 /drivers | |
parent | 9f2326be52f4fa83d20a75998cd3c87b300588c4 (diff) |
IB/ehca: Fix sg_page() fallout
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>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/infiniband/hw/ehca/ehca_mrmw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c index da88738265ed..ead7230d7738 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, | |||
1776 | list_for_each_entry_continue( | 1776 | list_for_each_entry_continue( |
1777 | chunk, (&(pginfo->u.usr.region->chunk_list)), list) { | 1777 | chunk, (&(pginfo->u.usr.region->chunk_list)), list) { |
1778 | for (i = pginfo->u.usr.next_nmap; i < chunk->nmap; ) { | 1778 | for (i = pginfo->u.usr.next_nmap; i < chunk->nmap; ) { |
1779 | pgaddr = page_to_pfn(chunk->page_list[i].page) | 1779 | pgaddr = page_to_pfn(sg_page(&chunk->page_list[i])) |
1780 | << PAGE_SHIFT ; | 1780 | << PAGE_SHIFT ; |
1781 | *kpage = phys_to_abs(pgaddr + | 1781 | *kpage = phys_to_abs(pgaddr + |
1782 | (pginfo->next_hwpage * | 1782 | (pginfo->next_hwpage * |
@@ -1832,7 +1832,7 @@ static int ehca_check_kpages_per_ate(struct scatterlist *page_list, | |||
1832 | { | 1832 | { |
1833 | int t; | 1833 | int t; |
1834 | for (t = start_idx; t <= end_idx; t++) { | 1834 | for (t = start_idx; t <= end_idx; t++) { |
1835 | u64 pgaddr = page_to_pfn(page_list[t].page) << PAGE_SHIFT; | 1835 | u64 pgaddr = page_to_pfn(sg_page(&page_list[t])) << PAGE_SHIFT; |
1836 | ehca_gen_dbg("chunk_page=%lx value=%016lx", pgaddr, | 1836 | ehca_gen_dbg("chunk_page=%lx value=%016lx", pgaddr, |
1837 | *(u64 *)abs_to_virt(phys_to_abs(pgaddr))); | 1837 | *(u64 *)abs_to_virt(phys_to_abs(pgaddr))); |
1838 | if (pgaddr - PAGE_SIZE != *prev_pgaddr) { | 1838 | if (pgaddr - PAGE_SIZE != *prev_pgaddr) { |
@@ -1867,7 +1867,7 @@ static int ehca_set_pagebuf_user2(struct ehca_mr_pginfo *pginfo, | |||
1867 | chunk, (&(pginfo->u.usr.region->chunk_list)), list) { | 1867 | chunk, (&(pginfo->u.usr.region->chunk_list)), list) { |
1868 | for (i = pginfo->u.usr.next_nmap; i < chunk->nmap; ) { | 1868 | for (i = pginfo->u.usr.next_nmap; i < chunk->nmap; ) { |
1869 | if (nr_kpages == kpages_per_hwpage) { | 1869 | if (nr_kpages == kpages_per_hwpage) { |
1870 | pgaddr = ( page_to_pfn(chunk->page_list[i].page) | 1870 | pgaddr = ( page_to_pfn(sg_page(&chunk->page_list[i])) |
1871 | << PAGE_SHIFT ); | 1871 | << PAGE_SHIFT ); |
1872 | *kpage = phys_to_abs(pgaddr); | 1872 | *kpage = phys_to_abs(pgaddr); |
1873 | if ( !(*kpage) ) { | 1873 | if ( !(*kpage) ) { |