From 134740faa6394824f2a47bdff1f40000b2d34bdb Mon Sep 17 00:00:00 2001 From: Arthur Jones Date: Wed, 16 Apr 2008 21:01:11 -0700 Subject: [PATCH] --- yaml --- r: 88483 b: refs/heads/master c: 3dd59e226e01ddb5b041eb0b2e7c7f28b1f730c9 h: refs/heads/master i: 88481: e75d3b2710b877a23866e5a887e64fe6b17ece5b 88479: e9611c574151ebb2cc308651f88ec4e418ba0123 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ipath/ipath_intr.c | 8 +++++--- trunk/drivers/infiniband/hw/ipath/ipath_srq.c | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6acf9abaf76d..9e1eea22134a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 680b575f6d1ae8aa39c4d7ee7e40b749d277fa9f +refs/heads/master: 3dd59e226e01ddb5b041eb0b2e7c7f28b1f730c9 diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_intr.c b/trunk/drivers/infiniband/hw/ipath/ipath_intr.c index 92e58c921522..3b8995206657 100644 --- a/trunk/drivers/infiniband/hw/ipath/ipath_intr.c +++ b/trunk/drivers/infiniband/hw/ipath/ipath_intr.c @@ -59,9 +59,11 @@ static void ipath_clrpiobuf(struct ipath_devdata *dd, u32 pnum) dev_info(&dd->pcidev->dev, "Rewrite PIO buffer %u, to recover from parity error\n", pnum); - *pbuf = dwcnt+1; /* no flush required, since already in freeze */ - while(--dwcnt) - *pbuf++ = 0; + + /* no flush required, since already in freeze */ + writel(dwcnt + 1, pbuf); + while (--dwcnt) + writel(0, pbuf++); } /* diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_srq.c b/trunk/drivers/infiniband/hw/ipath/ipath_srq.c index f772102e4713..3366d66ce155 100644 --- a/trunk/drivers/infiniband/hw/ipath/ipath_srq.c +++ b/trunk/drivers/infiniband/hw/ipath/ipath_srq.c @@ -245,7 +245,8 @@ int ipath_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr, sizeof(offset_addr)); if (ret) goto bail_free; - udata->outbuf = (void __user *) offset_addr; + udata->outbuf = + (void __user *) (unsigned long) offset_addr; ret = ib_copy_to_udata(udata, &offset, sizeof(offset)); if (ret)