]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ftrace: show virtual PID
authorLai Jiangshan <laijs@cn.fujitsu.com>
Tue, 24 Mar 2009 03:03:01 +0000 (11:03 +0800)
committerIngo Molnar <mingo@elte.hu>
Tue, 24 Mar 2009 15:42:49 +0000 (16:42 +0100)
Impact: fix PID output under namespaces

When current namespace is not the global namespace,
pid read from set_ftrace_pid is no correct.

 # ~/newpid_namespace_run bash
 # echo $$
 1
 # echo 1 > set_ftrace_pid
 # cat set_ftrace_pid
 3756

Since we write virtual PID to set_ftrace_pid, we need get
virtual PID when we read it.

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Steven Rostedt <srostedt@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <49C84D65.9050606@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/trace/ftrace.c

index 02d2de9d08baf6cc400a0b0a008cf69a46dbe404..bb377112b1bb42a81d425e5c5f1736a5772cfe28 100644 (file)
@@ -2264,7 +2264,7 @@ ftrace_pid_read(struct file *file, char __user *ubuf,
        if (ftrace_pid_trace == ftrace_swapper_pid)
                r = sprintf(buf, "swapper tasks\n");
        else if (ftrace_pid_trace)
-               r = sprintf(buf, "%u\n", pid_nr(ftrace_pid_trace));
+               r = sprintf(buf, "%u\n", pid_vnr(ftrace_pid_trace));
        else
                r = sprintf(buf, "no pid\n");