lkml.org 
[lkml]   [2007]   [Oct]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectIB/ehca: Fix sg_page() fallout
    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) ) {
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-10-23 06:27    [W:0.020 / U:7.068 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site