diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-20 02:53:13 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-20 02:53:13 -0500 |
| commit | 9774f3384125912eb491ca77f77907324db3ed05 (patch) | |
| tree | 0bdc7486e911dd9e955b41283ee19ac74521f7bd /drivers/infiniband/ulp/srp/ib_srp.c | |
| parent | 3be11c8f4f2fa194834c2e83540f34da442b8977 (diff) | |
| parent | f238085415c56618e042252894f2fcc971add645 (diff) | |
| download | blackbird-op-linux-9774f3384125912eb491ca77f77907324db3ed05.tar.gz blackbird-op-linux-9774f3384125912eb491ca77f77907324db3ed05.zip | |
merge linus into test branch
Diffstat (limited to 'drivers/infiniband/ulp/srp/ib_srp.c')
| -rw-r--r-- | drivers/infiniband/ulp/srp/ib_srp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index e9b6a6f07dd7..cdecbf5911c8 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -1898,7 +1898,7 @@ static void srp_add_one(struct ib_device *device) */ srp_dev->fmr_page_shift = max(9, ffs(dev_attr->page_size_cap) - 1); srp_dev->fmr_page_size = 1 << srp_dev->fmr_page_shift; - srp_dev->fmr_page_mask = ~((unsigned long) srp_dev->fmr_page_size - 1); + srp_dev->fmr_page_mask = ~((u64) srp_dev->fmr_page_size - 1); INIT_LIST_HEAD(&srp_dev->dev_list); |
