diff --git a/[refs] b/[refs] index 1cf9a50a2ef7..5798a7e2fbc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64b5fad526f63e9b56752a7e8e153b99ec0ddecd +refs/heads/master: f0229eaaf3f82522e2b16b41b0f45bb84a88d1b0 diff --git a/trunk/net/rds/ib_cm.c b/trunk/net/rds/ib_cm.c index 51c868923f64..a1e116277477 100644 --- a/trunk/net/rds/ib_cm.c +++ b/trunk/net/rds/ib_cm.c @@ -749,7 +749,7 @@ int rds_ib_conn_alloc(struct rds_connection *conn, gfp_t gfp) int ret; /* XXX too lazy? */ - ic = kzalloc(sizeof(struct rds_ib_connection), GFP_KERNEL); + ic = kzalloc(sizeof(struct rds_ib_connection), gfp); if (!ic) return -ENOMEM; diff --git a/trunk/net/rds/iw_cm.c b/trunk/net/rds/iw_cm.c index 9556d2895f7a..a91e1db62ee6 100644 --- a/trunk/net/rds/iw_cm.c +++ b/trunk/net/rds/iw_cm.c @@ -694,7 +694,7 @@ int rds_iw_conn_alloc(struct rds_connection *conn, gfp_t gfp) unsigned long flags; /* XXX too lazy? */ - ic = kzalloc(sizeof(struct rds_iw_connection), GFP_KERNEL); + ic = kzalloc(sizeof(struct rds_iw_connection), gfp); if (!ic) return -ENOMEM; diff --git a/trunk/net/rds/loop.c b/trunk/net/rds/loop.c index 87ff2a8a454b..6b12b68541ae 100644 --- a/trunk/net/rds/loop.c +++ b/trunk/net/rds/loop.c @@ -121,7 +121,7 @@ static int rds_loop_conn_alloc(struct rds_connection *conn, gfp_t gfp) struct rds_loop_connection *lc; unsigned long flags; - lc = kzalloc(sizeof(struct rds_loop_connection), GFP_KERNEL); + lc = kzalloc(sizeof(struct rds_loop_connection), gfp); if (!lc) return -ENOMEM;