diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 10:33:02 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 10:33:02 -0400 |
| commit | 9dc263239bb2cfeb242d8ef758fca66a968822d5 (patch) | |
| tree | 70c0c46fa6f01740c776ae24bc0874a8d97df222 /net/sunrpc/sched.c | |
| parent | 0e5dec478cfff2c29e68d1108ff828fa321adc59 (diff) | |
| parent | 829841146878e082613a49581ae252c071057c23 (diff) | |
Merge branch 'master'
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..ade730eaf401 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c | |||
| @@ -719,7 +719,7 @@ static void rpc_async_schedule(void *arg) | |||
| 719 | void * | 719 | void * |
| 720 | rpc_malloc(struct rpc_task *task, size_t size) | 720 | rpc_malloc(struct rpc_task *task, size_t size) |
| 721 | { | 721 | { |
| 722 | int gfp; | 722 | unsigned int __nocast gfp; |
| 723 | 723 | ||
| 724 | if (task->tk_flags & RPC_TASK_SWAPPER) | 724 | if (task->tk_flags & RPC_TASK_SWAPPER) |
| 725 | gfp = GFP_ATOMIC; | 725 | gfp = GFP_ATOMIC; |