Merge ../bleed-2.6

author: Greg KH <greg@press.(none)> 2005-10-28 13:13:16 -0400
committer: Greg Kroah-Hartman <gregkh@suse.de> 2005-10-28 13:13:16 -0400
commit: 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch)
tree: c0414e89678fcef7ce3493e048d855bde781ae8d /drivers/infiniband
parent: 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff)
parent: 27d1097d39509494706eaa2620ef3b1e780a3224 (diff)
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
index f6a8ac026557..378646b5a1b8 100644
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
@@ -524,7 +524,7 @@ void mthca_cmd_use_polling(struct mthca_dev *dev)
 }
 struct mthca_mailbox *mthca_alloc_mailbox(struct mthca_dev *dev,
-                                          unsigned int gfp_mask)
+                                          gfp_t gfp_mask)
 {
        struct mthca_mailbox *mailbox;
diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.h b/drivers/infiniband/hw/mthca/mthca_cmd.h
index 65f976a13e02..18175bec84c2 100644
--- a/drivers/infiniband/hw/mthca/mthca_cmd.h
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.h
@@ -248,7 +248,7 @@ void mthca_cmd_event(struct mthca_dev *dev, u16 token,
                     u8  status, u64 out_param);
 struct mthca_mailbox *mthca_alloc_mailbox(struct mthca_dev *dev,
-                                          unsigned int gfp_mask);
+                                          gfp_t gfp_mask);
 void mthca_free_mailbox(struct mthca_dev *dev, struct mthca_mailbox *mailbox);
 int mthca_SYS_EN(struct mthca_dev *dev, u8 *status);
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniband/hw/mthca/mthca_memfree.c
index 7bd7a4bec7b4..9ad8b3b6cfef 100644
--- 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,
-                                  unsigned int gfp_mask)
+                                  gfp_t gfp_mask)
 {
        struct mthca_icm *icm;
        struct mthca_icm_chunk *chunk = NULL;
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,
author	Greg KH <greg@press.(none)>	2005-10-28 13:13:16 -0400
committer	Greg Kroah-Hartman <gregkh@suse.de>	2005-10-28 13:13:16 -0400
commit	6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch)
tree	c0414e89678fcef7ce3493e048d855bde781ae8d /drivers/infiniband
parent	1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff)
parent	27d1097d39509494706eaa2620ef3b1e780a3224 (diff)

diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c index f6a8ac026557..378646b5a1b8 100644 --- a/drivers/infiniband/hw/mthca/mthca_cmd.c +++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
@@ -524,7 +524,7 @@ void mthca_cmd_use_polling(struct mthca_dev *dev)
524	}	524	}
525		525
526	struct mthca_mailbox mthca_alloc_mailbox(struct mthca_dev dev,	526	struct mthca_mailbox mthca_alloc_mailbox(struct mthca_dev dev,
527	unsigned int gfp_mask)	527	gfp_t gfp_mask)
528	{	528	{
529	struct mthca_mailbox *mailbox;	529	struct mthca_mailbox *mailbox;
530		530


diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.h b/drivers/infiniband/hw/mthca/mthca_cmd.h index 65f976a13e02..18175bec84c2 100644 --- a/drivers/infiniband/hw/mthca/mthca_cmd.h +++ b/drivers/infiniband/hw/mthca/mthca_cmd.h
@@ -248,7 +248,7 @@ void mthca_cmd_event(struct mthca_dev *dev, u16 token,
248	u8 status, u64 out_param);	248	u8 status, u64 out_param);
249		249
250	struct mthca_mailbox mthca_alloc_mailbox(struct mthca_dev dev,	250	struct mthca_mailbox mthca_alloc_mailbox(struct mthca_dev dev,
251	unsigned int gfp_mask);	251	gfp_t gfp_mask);
252	void mthca_free_mailbox(struct mthca_dev dev, struct mthca_mailbox mailbox);	252	void mthca_free_mailbox(struct mthca_dev dev, struct mthca_mailbox mailbox);
253		253
254	int mthca_SYS_EN(struct mthca_dev dev, u8 status);	254	int mthca_SYS_EN(struct mthca_dev dev, u8 status);


diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniband/hw/mthca/mthca_memfree.c index 7bd7a4bec7b4..9ad8b3b6cfef 100644 --- 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)
82	}	82	}
83		83
84	struct mthca_icm mthca_alloc_icm(struct mthca_dev dev, int npages,	84	struct mthca_icm mthca_alloc_icm(struct mthca_dev dev, int npages,
85	unsigned int gfp_mask)	85	gfp_t gfp_mask)
86	{	86	{
87	struct mthca_icm *icm;	87	struct mthca_icm *icm;
88	struct mthca_icm_chunk *chunk = NULL;	88	struct mthca_icm_chunk *chunk = NULL;


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 {
77	struct mthca_dev;	77	struct mthca_dev;
78		78
79	struct mthca_icm mthca_alloc_icm(struct mthca_dev dev, int npages,	79	struct mthca_icm mthca_alloc_icm(struct mthca_dev dev, int npages,
80	unsigned int gfp_mask);	80	gfp_t gfp_mask);
81	void mthca_free_icm(struct mthca_dev dev, struct mthca_icm icm);	81	void mthca_free_icm(struct mthca_dev dev, struct mthca_icm icm);
82		82
83	struct mthca_icm_table mthca_alloc_icm_table(struct mthca_dev dev,	83	struct mthca_icm_table mthca_alloc_icm_table(struct mthca_dev dev,