aboutsummaryrefslogtreecommitdiff
path: root/kernel/fork.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-02-24 16:48:27 -0800
committerTony Lindgren <tony@atomide.com>2012-02-24 16:48:27 -0800
commitffd76d8be36da09f8456c55569c008f5aa93095e (patch)
tree4a5e537edcdd3be9197c5fb7af1b4f7e4780ef77 /kernel/fork.c
parentbfe9c8ae114009491f51452ec727667d516ee79f (diff)
parentf0e15e2b0c6b3e89daade25a1e9a2d80136c14c3 (diff)
Merge branch 'for_3.4/dts_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into dt
Diffstat (limited to 'kernel/fork.c')
-rw-r--r--kernel/fork.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index 1b2ef3c23ae..b77fd559c78 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -910,7 +910,7 @@ static int copy_io(unsigned long clone_flags, struct task_struct *tsk)
return -ENOMEM;
new_ioc->ioprio = ioc->ioprio;
- put_io_context(new_ioc, NULL);
+ put_io_context(new_ioc);
}
#endif
return 0;