Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[linux-2.6] / drivers / infiniband / hw / mthca / mthca_uar.c

diff --git a/drivers/infiniband/hw/mthca/mthca_uar.c b/drivers/infiniband/hw/mthca/mthca_uar.c
index 1c8791ded6ffc442d200b91a4cc58a69c454cbb4..8b728486410d12aef77f16563220624d766fad18 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_uar.c
+++ b/drivers/infiniband/hw/mthca/mthca_uar.c
@@ -32,6 +32,8 @@
  * $Id$
  */
 
+#include <asm/page.h>          /* PAGE_SHIFT */
+
 #include "mthca_dev.h"
 #include "mthca_memfree.h"
 
@@ -58,7 +60,7 @@ int mthca_init_uar_table(struct mthca_dev *dev)
        ret = mthca_alloc_init(&dev->uar_table.alloc,
                               dev->limits.num_uars,
                               dev->limits.num_uars - 1,
-                              dev->limits.reserved_uars);
+                              dev->limits.reserved_uars + 1);
        if (ret)
                return ret;