7 files changed, 25 insertions, 29 deletions

diff --git a/kernel/acct.c b/kernel/acct.c
index fce53d8df8a7..cf19547cc9e4 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -413,7 +413,7 @@ static u32 encode_float(u64 value)
  *  The acct_process() call is the workhorse of the process
  *  accounting system. The struct acct is built here and then written
  *  into the accounting file. This function should only be called from
- *  do_exit().
+ *  do_exit() or when switching to a different output file.
  */
 
 /*
diff --git a/kernel/module.c b/kernel/module.c
index 3202c9950073..91fe6958b6e1 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -81,7 +81,8 @@ int unregister_module_notifier(struct notifier_block * nb)
 }
 EXPORT_SYMBOL(unregister_module_notifier);
 
-/* We require a truly strong try_module_get() */
+/* We require a truly strong try_module_get(): 0 means failure due to
+   ongoing or failed initialization etc. */
 static inline int strong_try_module_get(struct module *mod)
 {
         if (mod && mod->state == MODULE_STATE_COMING)
@@ -952,7 +953,8 @@ static unsigned long resolve_symbol(Elf_Shdr *sechdrs,
         ret = __find_symbol(name, &owner, &crc,
                         !(mod->taints & TAINT_PROPRIETARY_MODULE));
         if (ret) {
-                /* use_module can fail due to OOM, or module unloading */
+                /* use_module can fail due to OOM,
+                   or module initialization or unloading */
                 if (!check_version(sechdrs, versindex, name, mod, crc) ||
                     !use_module(mod, owner))
                         ret = 0;
@@ -1369,7 +1371,7 @@ dup:
         return ret;
 }
 
-/* Change all symbols so that sh_value encodes the pointer directly. */
+/* Change all symbols so that st_value encodes the pointer directly. */
 static int simplify_symbols(Elf_Shdr *sechdrs,
                             unsigned int symindex,
                             const char *strtab,
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index ca198a797bfa..5d0d623a5465 100644
--- 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);
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index ee00da284b12..2f16e15c022c 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -22,7 +22,7 @@
 
 /*
  * Targeted preemption latency for CPU-bound tasks:
- * (default: 20ms * ilog(ncpus), units: nanoseconds)
+ * (default: 20ms * (1 + ilog(ncpus)), units: nanoseconds)
  *
  * NOTE: this latency value is not the same as the concept of
  * 'timeslice length' - timeslices in CFS are of variable length
@@ -36,14 +36,14 @@ unsigned int sysctl_sched_latency = 20000000ULL;
 
 /*
  * Minimal preemption granularity for CPU-bound tasks:
- * (default: 1 msec * ilog(ncpus), units: nanoseconds)
+ * (default: 4 msec * (1 + ilog(ncpus)), units: nanoseconds)
  */
-unsigned int sysctl_sched_min_granularity = 1000000ULL;
+unsigned int sysctl_sched_min_granularity = 4000000ULL;
 
 /*
  * is kept at sysctl_sched_latency / sysctl_sched_min_granularity
  */
-static unsigned int sched_nr_latency = 20;
+static unsigned int sched_nr_latency = 5;
 
 /*
  * After fork, child runs first. (default) If set to 0 then
@@ -61,7 +61,7 @@ unsigned int __read_mostly sysctl_sched_compat_yield;
 
 /*
  * SCHED_BATCH wake-up granularity.
- * (default: 10 msec * ilog(ncpus), units: nanoseconds)
+ * (default: 10 msec * (1 + ilog(ncpus)), units: nanoseconds)
  *
  * This option delays the preemption effects of decoupled workloads
  * and reduces their over-scheduling. Synchronous workloads will still
@@ -71,7 +71,7 @@ unsigned int sysctl_sched_batch_wakeup_granularity = 10000000UL;
 
 /*
  * SCHED_OTHER wake-up granularity.
- * (default: 10 msec * ilog(ncpus), units: nanoseconds)
+ * (default: 10 msec * (1 + ilog(ncpus)), units: nanoseconds)
  *
  * This option delays the preemption effects of decoupled workloads
  * and reduces their over-scheduling. Synchronous workloads will still
diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
index fdfca0dd9905..6972f26c65f7 100644
--- a/kernel/sysctl_check.c
+++ b/kernel/sysctl_check.c
@@ -140,9 +140,6 @@ static struct trans_ctl_table trans_vm_table[] = {
         { VM_PANIC_ON_OOM,              "panic_on_oom" },
         { VM_VDSO_ENABLED,              "vdso_enabled" },
         { VM_MIN_SLAB,                  "min_slab_ratio" },
-        { VM_CMM_PAGES,                 "cmm_pages" },
-        { VM_CMM_TIMED_PAGES,           "cmm_timed_pages" },
-        { VM_CMM_TIMEOUT,               "cmm_timeout" },
 
         {}
 };
@@ -1188,16 +1185,6 @@ static struct trans_ctl_table trans_arlan_table[] = {
         {}
 };
 
-static struct trans_ctl_table trans_appldata_table[] = {
-        { CTL_APPLDATA_TIMER,           "timer" },
-        { CTL_APPLDATA_INTERVAL,        "interval" },
-        { CTL_APPLDATA_OS,              "os" },
-        { CTL_APPLDATA_NET_SUM,         "net_sum" },
-        { CTL_APPLDATA_MEM,             "mem" },
-        {}
-
-};
-
 static struct trans_ctl_table trans_s390dbf_table[] = {
         { 5678 /* CTL_S390DBF_STOPPABLE */,     "debug_stoppable" },
         { 5679 /* CTL_S390DBF_ACTIVE */,        "debug_active" },
@@ -1242,7 +1229,6 @@ static struct trans_ctl_table trans_root_table[] = {
         { CTL_ABI,      "abi" },
         /* CTL_CPU not used */
         { CTL_ARLAN,    "arlan",        trans_arlan_table },
-        { CTL_APPLDATA, "appldata",     trans_appldata_table },
         { CTL_S390DBF,  "s390dbf",      trans_s390dbf_table },
         { CTL_SUNRPC,   "sunrpc",       trans_sunrpc_table },
         { CTL_PM,       "pm",           trans_pm_table },
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 14a2ecf2b318..e64efaf957e8 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -249,10 +249,12 @@ int do_adjtimex(struct timex *txc)
 
         /* Now we validate the data before disabling interrupts */
 
-        if ((txc->modes & ADJ_OFFSET_SINGLESHOT) == ADJ_OFFSET_SINGLESHOT)
+        if ((txc->modes & ADJ_OFFSET_SINGLESHOT) == ADJ_OFFSET_SINGLESHOT) {
           /* singleshot must not be used with any other mode bits */
-                if (txc->modes != ADJ_OFFSET_SINGLESHOT)
+                if (txc->modes != ADJ_OFFSET_SINGLESHOT &&
+                                        txc->modes != ADJ_OFFSET_SS_READ)
                         return -EINVAL;
+        }
 
         if (txc->modes != ADJ_OFFSET_SINGLESHOT && (txc->modes & ADJ_OFFSET))
           /* adjustment Offset limited to +- .512 seconds */
@@ -372,7 +374,8 @@ int do_adjtimex(struct timex *txc)
 leave:  if ((time_status & (STA_UNSYNC|STA_CLOCKERR)) != 0)
                 result = TIME_ERROR;
 
-        if ((txc->modes & ADJ_OFFSET_SINGLESHOT) == ADJ_OFFSET_SINGLESHOT)
+        if ((txc->modes == ADJ_OFFSET_SINGLESHOT) ||
+                        (txc->modes == ADJ_OFFSET_SS_READ))
                 txc->offset = save_adjust;
         else
                 txc->offset = ((long)shift_right(time_offset, SHIFT_UPDATE)) *
diff --git a/kernel/user.c b/kernel/user.c
index 0f3aa0234107..8320a87f3e5a 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -337,8 +337,11 @@ struct user_struct * alloc_uid(struct user_namespace *ns, uid_t uid)
                 struct user_struct *new;
 
                 new = kmem_cache_alloc(uid_cachep, GFP_KERNEL);
-                if (!new)
+                if (!new) {
+                        uids_mutex_unlock();
                         return NULL;
+                }
+
                 new->uid = uid;
                 atomic_set(&new->__count, 1);
                 atomic_set(&new->processes, 0);
@@ -355,6 +358,7 @@ struct user_struct * alloc_uid(struct user_namespace *ns, uid_t uid)
 
                 if (alloc_uid_keyring(new, current) < 0) {
                         kmem_cache_free(uid_cachep, new);
+                        uids_mutex_unlock();
                         return NULL;
                 }
 
@@ -362,6 +366,7 @@ struct user_struct * alloc_uid(struct user_namespace *ns, uid_t uid)
                         key_put(new->uid_keyring);
                         key_put(new->session_keyring);
                         kmem_cache_free(uid_cachep, new);
+                        uids_mutex_unlock();
                         return NULL;
                 }