diff options
Diffstat (limited to 'kernel/sched/debug.c')
| -rw-r--r-- | kernel/sched/debug.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index dd52e7ffb10e..695f9773bb60 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c | |||
| @@ -111,8 +111,7 @@ static char *task_group_path(struct task_group *tg) | |||
| 111 | if (autogroup_path(tg, group_path, PATH_MAX)) | 111 | if (autogroup_path(tg, group_path, PATH_MAX)) |
| 112 | return group_path; | 112 | return group_path; |
| 113 | 113 | ||
| 114 | cgroup_path(tg->css.cgroup, group_path, PATH_MAX); | 114 | return cgroup_path(tg->css.cgroup, group_path, PATH_MAX); |
| 115 | return group_path; | ||
| 116 | } | 115 | } |
| 117 | #endif | 116 | #endif |
| 118 | 117 | ||
| @@ -321,6 +320,7 @@ do { \ | |||
| 321 | P(sched_goidle); | 320 | P(sched_goidle); |
| 322 | #ifdef CONFIG_SMP | 321 | #ifdef CONFIG_SMP |
| 323 | P64(avg_idle); | 322 | P64(avg_idle); |
| 323 | P64(max_idle_balance_cost); | ||
| 324 | #endif | 324 | #endif |
| 325 | 325 | ||
| 326 | P(ttwu_count); | 326 | P(ttwu_count); |
| @@ -533,15 +533,15 @@ static void sched_show_numa(struct task_struct *p, struct seq_file *m) | |||
| 533 | unsigned long nr_faults = -1; | 533 | unsigned long nr_faults = -1; |
| 534 | int cpu_current, home_node; | 534 | int cpu_current, home_node; |
| 535 | 535 | ||
| 536 | if (p->numa_faults) | 536 | if (p->numa_faults_memory) |
| 537 | nr_faults = p->numa_faults[2*node + i]; | 537 | nr_faults = p->numa_faults_memory[2*node + i]; |
| 538 | 538 | ||
| 539 | cpu_current = !i ? (task_node(p) == node) : | 539 | cpu_current = !i ? (task_node(p) == node) : |
| 540 | (pol && node_isset(node, pol->v.nodes)); | 540 | (pol && node_isset(node, pol->v.nodes)); |
| 541 | 541 | ||
| 542 | home_node = (p->numa_preferred_nid == node); | 542 | home_node = (p->numa_preferred_nid == node); |
| 543 | 543 | ||
| 544 | SEQ_printf(m, "numa_faults, %d, %d, %d, %d, %ld\n", | 544 | SEQ_printf(m, "numa_faults_memory, %d, %d, %d, %d, %ld\n", |
| 545 | i, node, cpu_current, home_node, nr_faults); | 545 | i, node, cpu_current, home_node, nr_faults); |
| 546 | } | 546 | } |
| 547 | } | 547 | } |
