diff options
| author | Michael S. Tsirkin <mst@mellanox.co.il> | 2006-01-05 16:17:38 -0800 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2006-01-05 16:17:38 -0800 |
| commit | 466200562ccd80f728f7ef602d2b97b4fdedd566 (patch) | |
| tree | 7bfbd22c9f888add6ec57852738fcd62530cbeb2 /drivers/infiniband | |
| parent | 38d1e793471d95728219f500bbb8bd25658d73b0 (diff) | |
| download | op-kernel-dev-466200562ccd80f728f7ef602d2b97b4fdedd566.zip op-kernel-dev-466200562ccd80f728f7ef602d2b97b4fdedd566.tar.gz | |
IB/mthca: create_eq with size not a power of 2
Fix mthca_create_eq for when the EQ size is not a power of 2.
Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_eq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_eq.c b/drivers/infiniband/hw/mthca/mthca_eq.c index 34d68e5..e8a948f 100644 --- a/drivers/infiniband/hw/mthca/mthca_eq.c +++ b/drivers/infiniband/hw/mthca/mthca_eq.c @@ -484,8 +484,7 @@ static int __devinit mthca_create_eq(struct mthca_dev *dev, u8 intr, struct mthca_eq *eq) { - int npages = (nent * MTHCA_EQ_ENTRY_SIZE + PAGE_SIZE - 1) / - PAGE_SIZE; + int npages; u64 *dma_list = NULL; dma_addr_t t; struct mthca_mailbox *mailbox; @@ -496,6 +495,7 @@ static int __devinit mthca_create_eq(struct mthca_dev *dev, eq->dev = dev; eq->nent = roundup_pow_of_two(max(nent, 2)); + npages = ALIGN(eq->nent * MTHCA_EQ_ENTRY_SIZE, PAGE_SIZE) / PAGE_SIZE; eq->page_list = kmalloc(npages * sizeof *eq->page_list, GFP_KERNEL); |
