Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

[linux-2.6] / net / rxrpc / call.c

diff --git a/net/rxrpc/call.c b/net/rxrpc/call.c
index 86f77705263389b4347ca79cc032f435973005cd..c4aeb7d40266f84d84c03023f482102d70d6b3df 100644 (file)
--- a/net/rxrpc/call.c
+++ b/net/rxrpc/call.c
@@ -1923,7 +1923,7 @@ int rxrpc_call_write_data(struct rxrpc_call *call,
                          size_t sioc,
                          struct kvec *siov,
                          u8 rxhdr_flags,
-                         unsigned int __nocast alloc_flags,
+                         gfp_t alloc_flags,
                          int dup_data,
                          size_t *size_sent)
 {