diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:29:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:29:23 -0400 |
| commit | 7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (patch) | |
| tree | 9116e5bde860d00685c5b6eee7be5ba9899aabb9 /drivers/infiniband/hw/mthca/mthca_memfree.h | |
| parent | 972c26bdd6b58e7534473c4f7928584578cf43f4 (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
| download | talos-op-linux-7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6.tar.gz talos-op-linux-7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_memfree.h')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_memfree.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.h b/drivers/infiniband/hw/mthca/mthca_memfree.h index bafa51544aa3..29433f295253 100644 --- a/drivers/infiniband/hw/mthca/mthca_memfree.h +++ b/drivers/infiniband/hw/mthca/mthca_memfree.h @@ -77,7 +77,7 @@ struct mthca_icm_iter { struct mthca_dev; struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages, - unsigned int gfp_mask); + gfp_t gfp_mask); void mthca_free_icm(struct mthca_dev *dev, struct mthca_icm *icm); struct mthca_icm_table *mthca_alloc_icm_table(struct mthca_dev *dev, |
