Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  sched: clean up kernel/sched_stat.h
  sched: clean up overlong line in kernel/sched_debug.c
  sched: clean up, move __sched_text_start/end to sched.h
  sched: clean up sd_alloc_ctl_cpu_table() definition
  softlockup: fix false positives on CONFIG_NOHZ

5 files changed, 14 insertions, 8 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index ee800e7a70d..ac3d496fbd2 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -282,6 +282,10 @@ static inline void touch_all_softlockup_watchdogs(void)
 
 /* Attach to any functions which should be ignored in wchan output. */
 #define __sched         __attribute__((__section__(".sched.text")))
+
+/* Linker adds these: start and end of __sched functions */
+extern char __sched_text_start[], __sched_text_end[];
+
 /* Is this address in the __sched functions? */
 extern int in_sched_functions(unsigned long addr);
 
diff --git a/kernel/sched.c b/kernel/sched.c
index 38933cafea8..98dcdf272db 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5466,7 +5466,7 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
         return table;
 }
 
-static ctl_table * sd_alloc_ctl_cpu_table(int cpu)
+static ctl_table *sd_alloc_ctl_cpu_table(int cpu)
 {
         struct ctl_table *entry, *table;
         struct sched_domain *sd;
@@ -6708,9 +6708,6 @@ void __init sched_init_smp(void)
 
 int in_sched_functions(unsigned long addr)
 {
-        /* Linker adds these: start and end of __sched functions */
-        extern char __sched_text_start[], __sched_text_end[];
-
         return in_lock_functions(addr) ||
                 (addr >= (unsigned long)__sched_text_start
                 && addr < (unsigned long)__sched_text_end);
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index 5d0d623a546..d30467b47dd 100644
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@ -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);
diff --git a/kernel/sched_stats.h b/kernel/sched_stats.h
index 630178e53bb..5b32433e7ee 100644
--- a/kernel/sched_stats.h
+++ b/kernel/sched_stats.h
@@ -52,7 +52,8 @@ static int show_schedstat(struct seq_file *seq, void *v)
                                     sd->lb_nobusyq[itype],
                                     sd->lb_nobusyg[itype]);
                         }
-                        seq_printf(seq, " %u %u %u %u %u %u %u %u %u %u %u %u\n",
+                        seq_printf(seq,
+                                   " %u %u %u %u %u %u %u %u %u %u %u %u\n",
                             sd->alb_count, sd->alb_failed, sd->alb_pushed,
                             sd->sbe_count, sd->sbe_balanced, sd->sbe_pushed,
                             sd->sbf_count, sd->sbf_balanced, sd->sbf_pushed,
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 27a2338deb4..cb89fa8db11 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -133,6 +133,8 @@ void tick_nohz_update_jiffies(void)
         if (!ts->tick_stopped)
                 return;
 
+        touch_softlockup_watchdog();
+
         cpu_clear(cpu, nohz_cpu_mask);
         now = ktime_get();