Pull bugzilla-9345 into release branch

[sfrench/cifs-2.6.git] / kernel / sched_debug.c

diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index 415e5c38554217ed348f91d80f7f20eaebd01560..d30467b47ddd0cd681f6da0afbe9c96c8b52df93 100644 (file)
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@ -199,7 +199,7 @@ static int sched_debug_show(struct seq_file *m, void *v)
        u64 now = ktime_to_ns(ktime_get());
        int cpu;
 
-       SEQ_printf(m, "Sched Debug Version: v0.06-v22, %s %.*s\n",
+       SEQ_printf(m, "Sched Debug Version: v0.07, %s %.*s\n",
                init_utsname()->release,
                (int)strcspn(init_utsname()->version, " "),
                init_utsname()->version);
@@ -211,7 +211,7 @@ static int sched_debug_show(struct seq_file *m, void *v)
 #define PN(x) \
        SEQ_printf(m, "  .%-40s: %Ld.%06ld\n", #x, SPLIT_NS(x))
        PN(sysctl_sched_latency);
-       PN(sysctl_sched_nr_latency);
+       PN(sysctl_sched_min_granularity);
        PN(sysctl_sched_wakeup_granularity);
        PN(sysctl_sched_batch_wakeup_granularity);
        PN(sysctl_sched_child_runs_first);
@@ -327,10 +327,12 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
                        avg_atom = -1LL;
 
                avg_per_cpu = p->se.sum_exec_runtime;
-               if (p->se.nr_migrations)
-                       avg_per_cpu = div64_64(avg_per_cpu, p->se.nr_migrations);
-               else
+               if (p->se.nr_migrations) {
+                       avg_per_cpu = div64_64(avg_per_cpu,
+                                              p->se.nr_migrations);
+               } else {
                        avg_per_cpu = -1LL;
+               }
 
                __PN(avg_atom);
                __PN(avg_per_cpu);