diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-01 11:19:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-01 11:19:52 +0100 |
| commit | d01bd6fdb3be2f6cec1d5918e20175adca97615b (patch) | |
| tree | 7d5196a198ccb77b43dfbfea8f2492966b3adf76 /kernel/fork.c | |
| parent | f056113faf553e166cb54bd6d1fe4f4b82c27568 (diff) | |
| parent | 5e9a2a3622d30c36814ea4df359c83dde1bf53a5 (diff) | |
Merge tag 'v3.10.46' into linux-linaro-lsk
This is the 3.10.46 stable release
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index ff7be9dac4c1..270c1dab674a 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1607,10 +1607,12 @@ long do_fork(unsigned long clone_flags, */ if (!IS_ERR(p)) { struct completion vfork; + struct pid *pid; trace_sched_process_fork(current, p); - nr = task_pid_vnr(p); + pid = get_task_pid(p, PIDTYPE_PID); + nr = pid_vnr(pid); if (clone_flags & CLONE_PARENT_SETTID) put_user(nr, parent_tidptr); @@ -1625,12 +1627,14 @@ long do_fork(unsigned long clone_flags, /* forking complete and child started to run, tell ptracer */ if (unlikely(trace)) - ptrace_event(trace, nr); + ptrace_event_pid(trace, pid); if (clone_flags & CLONE_VFORK) { if (!wait_for_vfork_done(p, &vfork)) - ptrace_event(PTRACE_EVENT_VFORK_DONE, nr); + ptrace_event_pid(PTRACE_EVENT_VFORK_DONE, pid); } + + put_pid(pid); } else { nr = PTR_ERR(p); } |