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_pd.c
diff --git
a/drivers/infiniband/hw/mthca/mthca_pd.c
b/drivers/infiniband/hw/mthca/mthca_pd.c
index
3dbf06a
..
c1e9507
100644
(file)
--- a/
drivers/infiniband/hw/mthca/mthca_pd.c
+++ b/
drivers/infiniband/hw/mthca/mthca_pd.c
@@
-34,7
+34,6
@@
* $Id: mthca_pd.c 1349 2004-12-16 21:09:43Z roland $
*/
* $Id: mthca_pd.c 1349 2004-12-16 21:09:43Z roland $
*/
-#include <linux/init.h>
#include <linux/errno.h>
#include "mthca_dev.h"
#include <linux/errno.h>
#include "mthca_dev.h"
@@
-43,8
+42,6
@@
int mthca_pd_alloc(struct mthca_dev *dev, int privileged, struct mthca_pd *pd)
{
int err = 0;
{
int err = 0;
- might_sleep();
-
pd->privileged = privileged;
atomic_set(&pd->sqp_count, 0);
pd->privileged = privileged;
atomic_set(&pd->sqp_count, 0);
@@
-66,13
+63,12
@@
int mthca_pd_alloc(struct mthca_dev *dev, int privileged, struct mthca_pd *pd)
void mthca_pd_free(struct mthca_dev *dev, struct mthca_pd *pd)
{
void mthca_pd_free(struct mthca_dev *dev, struct mthca_pd *pd)
{
- might_sleep();
if (pd->privileged)
mthca_free_mr(dev, &pd->ntmr);
mthca_free(&dev->pd_table.alloc, pd->pd_num);
}
if (pd->privileged)
mthca_free_mr(dev, &pd->ntmr);
mthca_free(&dev->pd_table.alloc, pd->pd_num);
}
-int
__devinit
mthca_init_pd_table(struct mthca_dev *dev)
+int mthca_init_pd_table(struct mthca_dev *dev)
{
return mthca_alloc_init(&dev->pd_table.alloc,
dev->limits.num_pds,
{
return mthca_alloc_init(&dev->pd_table.alloc,
dev->limits.num_pds,
@@
-80,7
+76,7
@@
int __devinit mthca_init_pd_table(struct mthca_dev *dev)
dev->limits.reserved_pds);
}
dev->limits.reserved_pds);
}
-void
__devexit
mthca_cleanup_pd_table(struct mthca_dev *dev)
+void mthca_cleanup_pd_table(struct mthca_dev *dev)
{
/* XXX check if any PDs are still allocated? */
mthca_alloc_cleanup(&dev->pd_table.alloc);
{
/* XXX check if any PDs are still allocated? */
mthca_alloc_cleanup(&dev->pd_table.alloc);