diff --git a/[refs] b/[refs] index 2b055d295708..24e8168e3a2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0746556beab1a57f1afb5c9d6f393d98528ce682 +refs/heads/master: 9b9d2e00bfa592aceda7b43da76c670df61faa97 diff --git a/trunk/net/rds/rdma.c b/trunk/net/rds/rdma.c index 48064673fc76..1a41debca1ce 100644 --- a/trunk/net/rds/rdma.c +++ b/trunk/net/rds/rdma.c @@ -522,7 +522,7 @@ int rds_cmsg_rdma_args(struct rds_sock *rs, struct rds_message *rm, struct rds_rdma_args *args; struct rds_iovec vec; struct rm_rdma_op *op = &rm->rdma; - unsigned int nr_pages; + int nr_pages; unsigned int nr_bytes; struct page **pages = NULL; struct rds_iovec __user *local_vec;