2 files changed, 5 insertions, 17 deletions

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/sysctl_check.c b/kernel/sysctl_check.c
index 4abc6d2306f4..8f5baac1eb08 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" },
 
         {}
 };
@@ -1219,16 +1216,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" },
@@ -1273,7 +1260,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 },