1 files changed, 35 insertions, 12 deletions

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 34a604726d0b..49e13e1f8fe6 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -62,6 +62,7 @@
 #include <linux/capability.h>
 #include <linux/binfmts.h>
 #include <linux/sched/sysctl.h>
+#include <linux/kexec.h>
 
 #include <asm/uaccess.h>
 #include <asm/processor.h>
@@ -95,8 +96,6 @@
 #if defined(CONFIG_SYSCTL)
 
 /* External variables not in a header file. */
-extern int sysctl_overcommit_memory;
-extern int sysctl_overcommit_ratio;
 extern int max_threads;
 extern int suid_dumpable;
 #ifdef CONFIG_COREDUMP
@@ -122,6 +121,8 @@ extern int blk_iopoll_enabled;
 static int sixty = 60;
 #endif
 
+static int __maybe_unused neg_one = -1;
+
 static int zero;
 static int __maybe_unused one = 1;
 static int __maybe_unused two = 2;
@@ -385,19 +386,21 @@ static struct ctl_table kern_table[] = {
                 .proc_handler   = proc_dointvec,
         },
         {
-                .procname       = "numa_balancing_settle_count",
-                .data           = &sysctl_numa_balancing_settle_count,
-                .maxlen         = sizeof(unsigned int),
-                .mode           = 0644,
-                .proc_handler   = proc_dointvec,
-        },
-        {
                 .procname       = "numa_balancing_migrate_deferred",
                 .data           = &sysctl_numa_balancing_migrate_deferred,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
         },
+        {
+                .procname       = "numa_balancing",
+                .data           = NULL, /* filled in by handler */
+                .maxlen         = sizeof(unsigned int),
+                .mode           = 0644,
+                .proc_handler   = sysctl_numa_balancing,
+                .extra1         = &zero,
+                .extra2         = &one,
+        },
 #endif /* CONFIG_NUMA_BALANCING */
 #endif /* CONFIG_SCHED_DEBUG */
         {
@@ -614,6 +617,18 @@ static struct ctl_table kern_table[] = {
                 .proc_handler   = proc_dointvec,
         },
 #endif
+#ifdef CONFIG_KEXEC
+        {
+                .procname       = "kexec_load_disabled",
+                .data           = &kexec_load_disabled,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                /* only handle a transition from default "0" to "1" */
+                .proc_handler   = proc_dointvec_minmax,
+                .extra1         = &one,
+                .extra2         = &one,
+        },
+#endif
 #ifdef CONFIG_MODULES
         {
                 .procname       = "modprobe",
@@ -984,9 +999,10 @@ static struct ctl_table kern_table[] = {
         {
                 .procname       = "hung_task_warnings",
                 .data           = &sysctl_hung_task_warnings,
-                .maxlen         = sizeof(unsigned long),
+                .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = proc_doulongvec_minmax,
+                .proc_handler   = proc_dointvec_minmax,
+                .extra1         = &neg_one,
         },
 #endif
 #ifdef CONFIG_COMPAT
@@ -1128,7 +1144,14 @@ static struct ctl_table vm_table[] = {
                 .data           = &sysctl_overcommit_ratio,
                 .maxlen         = sizeof(sysctl_overcommit_ratio),
                 .mode           = 0644,
-                .proc_handler   = proc_dointvec,
+                .proc_handler   = overcommit_ratio_handler,
+        },
+        {
+                .procname       = "overcommit_kbytes",
+                .data           = &sysctl_overcommit_kbytes,
+                .maxlen         = sizeof(sysctl_overcommit_kbytes),
+                .mode           = 0644,
+                .proc_handler   = overcommit_kbytes_handler,
         },
         {
                 .procname       = "page-cluster",