git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
[safe/jmp/linux-2.6]
/
drivers
/
infiniband
/
hw
/
mthca
/
mthca_memfree.c
diff --git
a/drivers/infiniband/hw/mthca/mthca_memfree.c
b/drivers/infiniband/hw/mthca/mthca_memfree.c
index
d63b1a1
..
d72fe95
100644
(file)
--- a/
drivers/infiniband/hw/mthca/mthca_memfree.c
+++ b/
drivers/infiniband/hw/mthca/mthca_memfree.c
@@
-82,7
+82,7
@@
void mthca_free_icm(struct mthca_dev *dev, struct mthca_icm *icm)
}
struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages,
}
struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages,
-
unsigned in
t gfp_mask)
+
gfp_
t gfp_mask)
{
struct mthca_icm *icm;
struct mthca_icm_chunk *chunk = NULL;
{
struct mthca_icm *icm;
struct mthca_icm_chunk *chunk = NULL;