diff options
Diffstat (limited to 'include/rdma')
-rw-r--r-- | include/rdma/ib_mad.h | 2 | ||||
-rw-r--r-- | include/rdma/ib_sa.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/rdma/ib_mad.h b/include/rdma/ib_mad.h index 0e293fe733b0..4172e6841e3d 100644 --- a/include/rdma/ib_mad.h +++ b/include/rdma/ib_mad.h | |||
@@ -596,7 +596,7 @@ struct ib_mad_send_buf * ib_create_send_mad(struct ib_mad_agent *mad_agent, | |||
596 | u32 remote_qpn, u16 pkey_index, | 596 | u32 remote_qpn, u16 pkey_index, |
597 | struct ib_ah *ah, int rmpp_active, | 597 | struct ib_ah *ah, int rmpp_active, |
598 | int hdr_len, int data_len, | 598 | int hdr_len, int data_len, |
599 | unsigned int __nocast gfp_mask); | 599 | gfp_t gfp_mask); |
600 | 600 | ||
601 | /** | 601 | /** |
602 | * ib_free_send_mad - Returns data buffers used to send a MAD. | 602 | * ib_free_send_mad - Returns data buffers used to send a MAD. |
diff --git a/include/rdma/ib_sa.h b/include/rdma/ib_sa.h index a7555c800ecf..f404fe21cc21 100644 --- a/include/rdma/ib_sa.h +++ b/include/rdma/ib_sa.h | |||
@@ -285,7 +285,7 @@ void ib_sa_cancel_query(int id, struct ib_sa_query *query); | |||
285 | int ib_sa_path_rec_get(struct ib_device *device, u8 port_num, | 285 | int ib_sa_path_rec_get(struct ib_device *device, u8 port_num, |
286 | struct ib_sa_path_rec *rec, | 286 | struct ib_sa_path_rec *rec, |
287 | ib_sa_comp_mask comp_mask, | 287 | ib_sa_comp_mask comp_mask, |
288 | int timeout_ms, unsigned int __nocast gfp_mask, | 288 | int timeout_ms, gfp_t gfp_mask, |
289 | void (*callback)(int status, | 289 | void (*callback)(int status, |
290 | struct ib_sa_path_rec *resp, | 290 | struct ib_sa_path_rec *resp, |
291 | void *context), | 291 | void *context), |
@@ -296,7 +296,7 @@ int ib_sa_mcmember_rec_query(struct ib_device *device, u8 port_num, | |||
296 | u8 method, | 296 | u8 method, |
297 | struct ib_sa_mcmember_rec *rec, | 297 | struct ib_sa_mcmember_rec *rec, |
298 | ib_sa_comp_mask comp_mask, | 298 | ib_sa_comp_mask comp_mask, |
299 | int timeout_ms, unsigned int __nocast gfp_mask, | 299 | int timeout_ms, gfp_t gfp_mask, |
300 | void (*callback)(int status, | 300 | void (*callback)(int status, |
301 | struct ib_sa_mcmember_rec *resp, | 301 | struct ib_sa_mcmember_rec *resp, |
302 | void *context), | 302 | void *context), |
@@ -307,7 +307,7 @@ int ib_sa_service_rec_query(struct ib_device *device, u8 port_num, | |||
307 | u8 method, | 307 | u8 method, |
308 | struct ib_sa_service_rec *rec, | 308 | struct ib_sa_service_rec *rec, |
309 | ib_sa_comp_mask comp_mask, | 309 | ib_sa_comp_mask comp_mask, |
310 | int timeout_ms, unsigned int __nocast gfp_mask, | 310 | int timeout_ms, gfp_t gfp_mask, |
311 | void (*callback)(int status, | 311 | void (*callback)(int status, |
312 | struct ib_sa_service_rec *resp, | 312 | struct ib_sa_service_rec *resp, |
313 | void *context), | 313 | void *context), |
@@ -342,7 +342,7 @@ static inline int | |||
342 | ib_sa_mcmember_rec_set(struct ib_device *device, u8 port_num, | 342 | ib_sa_mcmember_rec_set(struct ib_device *device, u8 port_num, |
343 | struct ib_sa_mcmember_rec *rec, | 343 | struct ib_sa_mcmember_rec *rec, |
344 | ib_sa_comp_mask comp_mask, | 344 | ib_sa_comp_mask comp_mask, |
345 | int timeout_ms, unsigned int __nocast gfp_mask, | 345 | int timeout_ms, gfp_t gfp_mask, |
346 | void (*callback)(int status, | 346 | void (*callback)(int status, |
347 | struct ib_sa_mcmember_rec *resp, | 347 | struct ib_sa_mcmember_rec *resp, |
348 | void *context), | 348 | void *context), |
@@ -384,7 +384,7 @@ static inline int | |||
384 | ib_sa_mcmember_rec_delete(struct ib_device *device, u8 port_num, | 384 | ib_sa_mcmember_rec_delete(struct ib_device *device, u8 port_num, |
385 | struct ib_sa_mcmember_rec *rec, | 385 | struct ib_sa_mcmember_rec *rec, |
386 | ib_sa_comp_mask comp_mask, | 386 | ib_sa_comp_mask comp_mask, |
387 | int timeout_ms, unsigned int __nocast gfp_mask, | 387 | int timeout_ms, gfp_t gfp_mask, |
388 | void (*callback)(int status, | 388 | void (*callback)(int status, |
389 | struct ib_sa_mcmember_rec *resp, | 389 | struct ib_sa_mcmember_rec *resp, |
390 | void *context), | 390 | void *context), |