28 files changed, 706 insertions, 710 deletions

diff --git a/kernel/sched/autogroup.c b/kernel/sched/autogroup.c
index bb4b9fe026a1..ff1b7b647b86 100644
--- a/kernel/sched/autogroup.c
+++ b/kernel/sched/autogroup.c
@@ -168,18 +168,19 @@ autogroup_move_group(struct task_struct *p, struct autogroup *ag)
         autogroup_kref_put(prev);
 }
 
-/* Allocates GFP_KERNEL, cannot be called under any spinlock */
+/* Allocates GFP_KERNEL, cannot be called under any spinlock: */
 void sched_autogroup_create_attach(struct task_struct *p)
 {
         struct autogroup *ag = autogroup_create();
 
         autogroup_move_group(p, ag);
-        /* drop extra reference added by autogroup_create() */
+
+        /* Drop extra reference added by autogroup_create(): */
         autogroup_kref_put(ag);
 }
 EXPORT_SYMBOL(sched_autogroup_create_attach);
 
-/* Cannot be called under siglock.  Currently has no users */
+/* Cannot be called under siglock. Currently has no users: */
 void sched_autogroup_detach(struct task_struct *p)
 {
         autogroup_move_group(p, &autogroup_default);
@@ -202,7 +203,6 @@ static int __init setup_autogroup(char *str)
 
         return 1;
 }
-
 __setup("noautogroup", setup_autogroup);
 
 #ifdef CONFIG_PROC_FS
@@ -224,7 +224,7 @@ int proc_sched_autogroup_set_nice(struct task_struct *p, int nice)
         if (nice < 0 && !can_nice(current, nice))
                 return -EPERM;
 
-        /* this is a heavy operation taking global locks.. */
+        /* This is a heavy operation, taking global locks.. */
         if (!capable(CAP_SYS_ADMIN) && time_before(jiffies, next))
                 return -EAGAIN;
 
@@ -267,4 +267,4 @@ int autogroup_path(struct task_group *tg, char *buf, int buflen)
 
         return snprintf(buf, buflen, "%s-%ld", "/autogroup", tg->autogroup->id);
 }
-#endif /* CONFIG_SCHED_DEBUG */
+#endif
diff --git a/kernel/sched/autogroup.h b/kernel/sched/autogroup.h
index 27cd22b89824..49e6ec9559cf 100644
--- a/kernel/sched/autogroup.h
+++ b/kernel/sched/autogroup.h
@@ -7,9 +7,9 @@
 
 struct autogroup {
         /*
-         * reference doesn't mean how many thread attach to this
-         * autogroup now. It just stands for the number of task
-         * could use this autogroup.
+         * Reference doesn't mean how many threads attach to this
+         * autogroup now. It just stands for the number of tasks
+         * which could use this autogroup.
          */
         struct kref             kref;
         struct task_group       *tg;
@@ -56,11 +56,9 @@ autogroup_task_group(struct task_struct *p, struct task_group *tg)
         return tg;
 }
 
-#ifdef CONFIG_SCHED_DEBUG
 static inline int autogroup_path(struct task_group *tg, char *buf, int buflen)
 {
         return 0;
 }
-#endif
 
 #endif /* CONFIG_SCHED_AUTOGROUP */
diff --git a/kernel/sched/clock.c b/kernel/sched/clock.c
index e086babe6c61..7da6bec8a2ff 100644
--- a/kernel/sched/clock.c
+++ b/kernel/sched/clock.c
@@ -1,5 +1,5 @@
 /*
- * sched_clock for unstable cpu clocks
+ * sched_clock() for unstable CPU clocks
  *
  *  Copyright (C) 2008 Red Hat, Inc., Peter Zijlstra
  *
@@ -11,7 +11,7 @@
  *   Guillaume Chazarain <guichaz@gmail.com>
  *
  *
- * What:
+ * What this file implements:
  *
  * cpu_clock(i) provides a fast (execution time) high resolution
  * clock with bounded drift between CPUs. The value of cpu_clock(i)
@@ -26,11 +26,11 @@
  * at 0 on boot (but people really shouldn't rely on that).
  *
  * cpu_clock(i)       -- can be used from any context, including NMI.
- * local_clock()      -- is cpu_clock() on the current cpu.
+ * local_clock()      -- is cpu_clock() on the current CPU.
  *
  * sched_clock_cpu(i)
  *
- * How:
+ * How it is implemented:
  *
  * The implementation either uses sched_clock() when
  * !CONFIG_HAVE_UNSTABLE_SCHED_CLOCK, which means in that case the
@@ -302,21 +302,21 @@ again:
          * cmpxchg64 below only protects one readout.
          *
          * We must reread via sched_clock_local() in the retry case on
-         * 32bit as an NMI could use sched_clock_local() via the
+         * 32-bit kernels as an NMI could use sched_clock_local() via the
          * tracer and hit between the readout of
-         * the low32bit and the high 32bit portion.
+         * the low 32-bit and the high 32-bit portion.
          */
         this_clock = sched_clock_local(my_scd);
         /*
-         * We must enforce atomic readout on 32bit, otherwise the
-         * update on the remote cpu can hit inbetween the readout of
-         * the low32bit and the high 32bit portion.
+         * We must enforce atomic readout on 32-bit, otherwise the
+         * update on the remote CPU can hit inbetween the readout of
+         * the low 32-bit and the high 32-bit portion.
          */
         remote_clock = cmpxchg64(&scd->clock, 0, 0);
 #else
         /*
-         * On 64bit the read of [my]scd->clock is atomic versus the
-         * update, so we can avoid the above 32bit dance.
+         * On 64-bit kernels the read of [my]scd->clock is atomic versus the
+         * update, so we can avoid the above 32-bit dance.
          */
         sched_clock_local(my_scd);
 again:
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 8fff4f16c510..9427b59551c1 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -135,7 +135,7 @@ struct rq *task_rq_lock(struct task_struct *p, struct rq_flags *rf)
                  *                                      [L] ->on_rq
                  *      RELEASE (rq->lock)
                  *
-                 * If we observe the old cpu in task_rq_lock, the acquire of
+                 * If we observe the old CPU in task_rq_lock, the acquire of