diff options
| author | Len Brown <len.brown@intel.com> | 2005-12-06 17:31:30 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-12-06 17:31:30 -0500 |
| commit | 3d5271f9883cba7b54762bc4fe027d4172f06db7 (patch) | |
| tree | ab8a881a14478598a0c8bda0d26c62cdccfffd6d /include/rdma/ib_sa.h | |
| parent | 378b2556f4e09fa6f87ff0cb5c4395ff28257d02 (diff) | |
| parent | 9115a6c787596e687df03010d97fccc5e0762506 (diff) | |
Pull release into acpica branch
Diffstat (limited to 'include/rdma/ib_sa.h')
| -rw-r--r-- | include/rdma/ib_sa.h | 10 |
1 files changed, 5 insertions, 5 deletions
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), |