diff options
| author |   Mike Marciniszyn <mike.marciniszyn@intel.com> | 2015-01-16 11:23:31 -0500 |
|---|---|---|
| committer |   Roland Dreier <roland@purestorage.com> | 2015-02-20 09:04:12 -0800 |
| commit | da12c1f6857c07bccdb7e96fde938d6840a77f4f (patch) | |
| tree | f44e988e9085293d49d80a6231964443a2691e57 /drivers/infiniband/hw/qib/qib_wc_x86_64.c | |
| parent | IB/qib: Fix checkpatch warnings (diff) | |
| download | linux-dev-da12c1f6857c07bccdb7e96fde938d6840a77f4f.tar.xz linux-dev-da12c1f6857c07bccdb7e96fde938d6840a77f4f.zip | |
IB/qib: Add blank line after declaration
Upstream checkpatch now requires this.
Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_wc_x86_64.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/qib/qib_wc_x86_64.c b/drivers/infiniband/hw/qib/qib_wc_x86_64.c index a9cbcf51d4f2..81b225f2300a 100644 --- a/drivers/infiniband/hw/qib/qib_wc_x86_64.c +++ b/drivers/infiniband/hw/qib/qib_wc_x86_64.c @@ -72,6 +72,7 @@ int qib_enable_wc(struct qib_devdata *dd) if (dd->piobcnt2k && dd->piobcnt4k) { /* 2 sizes for chip */ unsigned long pio2kbase, pio4kbase; + pio2kbase = dd->piobufbase & 0xffffffffUL; pio4kbase = (dd->piobufbase >> 32) & 0xffffffffUL; if (pio2kbase < pio4kbase) { @@ -100,8 +101,8 @@ int qib_enable_wc(struct qib_devdata *dd) piolen = 1ULL << (bits + 1); } if (pioaddr & (piolen - 1)) { - u64 atmp; - atmp = pioaddr & ~(piolen - 1); + u64 atmp = pioaddr & ~(piolen - 1); + if (atmp < addr || (atmp + piolen) > (addr + len)) { qib_dev_err(dd, "No way to align address/size (%llx/%llx), no WC mtrr\n", |