diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 20:40:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 20:40:37 -0700 |
| commit | 6db602d447fb6c3aeb020c5dff5219de317f8bb4 (patch) | |
| tree | 379cfdff0c1f6eb66edfbc6a50dfde281602ca13 /drivers/infiniband/hw/ehca/ipz_pt_fn.c | |
| parent | e89a5a43b95cdc4305b7c8e8121a380f02476636 (diff) | |
| parent | 5ff70cac3e98af64f9a1eaec9e762ff4927c26d1 (diff) | |
| download | blackbird-obmc-linux-6db602d447fb6c3aeb020c5dff5219de317f8bb4.tar.gz blackbird-obmc-linux-6db602d447fb6c3aeb020c5dff5219de317f8bb4.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/ehca: SRQ fixes to enable IPoIB CM
IB/ehca: Fix Small QP regressions
Diffstat (limited to 'drivers/infiniband/hw/ehca/ipz_pt_fn.c')
| -rw-r--r-- | drivers/infiniband/hw/ehca/ipz_pt_fn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.c b/drivers/infiniband/hw/ehca/ipz_pt_fn.c index a090c679c397..29bd476fbd54 100644 --- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c +++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c @@ -172,7 +172,7 @@ static void free_small_queue_page(struct ipz_queue *queue, struct ehca_pd *pd) unsigned long bit; int free_page = 0; - bit = ((unsigned long)queue->queue_pages[0] & PAGE_MASK) + bit = ((unsigned long)queue->queue_pages[0] & ~PAGE_MASK) >> (order + 9); mutex_lock(&pd->lock); |
