diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-12 14:43:32 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-12 14:43:32 +1000 |
| commit | b6ec995a21a9428aef620b5adf46d047a18d88b8 (patch) | |
| tree | 6719121e6605cbca524b687f47336b9bbf3b8d41 /net/sunrpc/sched.c | |
| parent | 3a5f8c5f788d68e325d9fe3c26f4df5a5aee838a (diff) | |
| parent | da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89 (diff) | |
Merge from Linus' tree
Diffstat (limited to 'net/sunrpc/sched.c')
| -rw-r--r-- | net/sunrpc/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index f3104035e35d..54e60a657500 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -719,7 +719,7 @@ static void rpc_async_schedule(void *arg) void * rpc_malloc(struct rpc_task *task, size_t size) { - int gfp; + gfp_t gfp; if (task->tk_flags & RPC_TASK_SWAPPER) gfp = GFP_ATOMIC; |