git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-signal-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
fs
/
proc
/
array.c
diff --git
a/fs/proc/array.c
b/fs/proc/array.c
index
9b45ee8
..
3a1dafd
100644
(file)
--- 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);
}