diff options
author | 2011-08-08 14:30:29 +0200 | |
---|---|---|
committer | 2011-08-08 14:30:29 +0200 | |
commit | 0a2d31b62dba9b5b92a38c67c9cc42630513662a (patch) | |
tree | f755d74ec85248de645e10c45ed1a2ed467530f6 /fs/proc/array.c | |
parent | sound: pss - don't use the deprecated function check_region (diff) | |
parent | ALSA: Fix dependency of CONFIG_SND_TEA575X (diff) | |
download | wireguard-linux-0a2d31b62dba9b5b92a38c67c9cc42630513662a.tar.xz wireguard-linux-0a2d31b62dba9b5b92a38c67c9cc42630513662a.zip |
Merge branch 'fix/kconfig' into for-linus
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r-- | fs/proc/array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 9b45ee84fbcc..3a1dafd228d1 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -172,7 +172,7 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns, task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0; tpid = 0; if (pid_alive(p)) { - struct task_struct *tracer = tracehook_tracer_task(p); + struct task_struct *tracer = ptrace_parent(p); if (tracer) tpid = task_pid_nr_ns(tracer, ns); } |