Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fc840914e9b07ab4685c195e1e54e58de4f84c03

Authored by Peter Zijlstra
Committed by Ingo Molnar
1 parent 6c9a27f5da
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

sched/debug: Take PID namespace into account 

Emmanuel reported that /proc/sched_debug didn't report the right PIDs
when using namespaces, cure this.

Reported-by: Emmanuel Deloget <emmanuel.deloget@efixo.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20130909110141.GM31370@twins.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

kernel/sched/debug.c
Diff comments   View file @ fc84091
... ... @@ -124,7 +124,7 @@
124 124 SEQ_printf(m, " ");
125 125  
126 126 SEQ_printf(m, "%15s %5d %9Ld.%06ld %9Ld %5d ",
127   - p->comm, p->pid,
  127 + p->comm, task_pid_nr(p),
128 128 SPLIT_NS(p->se.vruntime),
129 129 (long long)(p->nvcsw + p->nivcsw),
130 130 p->prio);
... ... @@ -289,7 +289,7 @@
289 289 P(nr_load_updates);
290 290 P(nr_uninterruptible);
291 291 PN(next_balance);
292   - P(curr->pid);
  292 + SEQ_printf(m, " .%-30s: %ld\n", "curr->pid", (long)(task_pid_nr(rq->curr)));
293 293 PN(clock);
294 294 P(cpu_load[0]);
295 295 P(cpu_load[1]);
... ... @@ -492,7 +492,7 @@
492 492 {
493 493 unsigned long nr_switches;
494 494  
495   - SEQ_printf(m, "%s (%d, #threads: %d)\n", p->comm, p->pid,
  495 + SEQ_printf(m, "%s (%d, #threads: %d)\n", p->comm, task_pid_nr(p),
496 496 get_nr_threads(p));
497 497 SEQ_printf(m,
498 498 "---------------------------------------------------------"