git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
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
1c8791d
..
8b72848
100644
(file)
--- a/
drivers/infiniband/hw/mthca/mthca_uar.c
+++ b/
drivers/infiniband/hw/mthca/mthca_uar.c
@@
-32,6
+32,8
@@
* $Id$
*/
* $Id$
*/
+#include <asm/page.h> /* PAGE_SHIFT */
+
#include "mthca_dev.h"
#include "mthca_memfree.h"
#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,
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;
if (ret)
return ret;