1 files changed, 53 insertions, 11 deletions

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 2e490a389dd2..4286b62b34a0 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -48,6 +48,7 @@
 #include <linux/acpi.h>
 #include <linux/reboot.h>
 #include <linux/ftrace.h>
+#include <linux/slow-work.h>
 
 #include <asm/uaccess.h>
 #include <asm/processor.h>
@@ -95,14 +96,12 @@ static int sixty = 60;
 static int neg_one = -1;
 #endif
 
-#if defined(CONFIG_MMU) && defined(CONFIG_FILE_LOCKING)
-static int two = 2;
-#endif
-
 static int zero;
-static int one = 1;
+static int __maybe_unused one = 1;
+static int __maybe_unused two = 2;
 static unsigned long one_ul = 1;
 static int one_hundred = 100;
+static int one_thousand = 1000;
 
 /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
 static int maxolduid = 65535;
@@ -815,6 +814,19 @@ static struct ctl_table kern_table[] = {
                 .extra1         = &neg_one,
                 .extra2         = &sixty,
         },
+#endif
+#ifdef CONFIG_DETECT_HUNG_TASK
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "hung_task_panic",
+                .data           = &sysctl_hung_task_panic,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec_minmax,
+                .strategy       = &sysctl_intvec,
+                .extra1         = &zero,
+                .extra2         = &one,
+        },
         {
                 .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "hung_task_check_count",
@@ -830,7 +842,7 @@ static struct ctl_table kern_table[] = {
                 .data           = &sysctl_hung_task_timeout_secs,
                 .maxlen         = sizeof(unsigned long),
                 .mode           = 0644,
-                .proc_handler   = &proc_doulongvec_minmax,
+                .proc_handler   = &proc_dohung_task_timeout_secs,
                 .strategy       = &sysctl_intvec,
         },
         {
@@ -900,6 +912,14 @@ static struct ctl_table kern_table[] = {
                 .proc_handler   = &scan_unevictable_handler,
         },
 #endif
+#ifdef CONFIG_SLOW_WORK
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "slow-work",
+                .mode           = 0555,
+                .child          = slow_work_sysctls,
+        },
+#endif
 /*
  * NOTE: do not add new entries to this table unless you have read
  * Documentation/sysctl/ctl_unnumbered.txt
@@ -1021,6 +1041,28 @@ static struct ctl_table vm_table[] = {
                 .proc_handler   = &proc_dointvec,
         },
         {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "nr_pdflush_threads_min",
+                .data           = &nr_pdflush_threads_min,
+                .maxlen         = sizeof nr_pdflush_threads_min,
+                .mode           = 0644 /* read-write */,
+                .proc_handler   = &proc_dointvec_minmax,
+                .strategy       = &sysctl_intvec,
+                .extra1         = &one,
+                .extra2         = &nr_pdflush_threads_max,
+        },
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "nr_pdflush_threads_max",
+                .data           = &nr_pdflush_threads_max,
+                .maxlen         = sizeof nr_pdflush_threads_max,
+                .mode           = 0644 /* read-write */,
+                .proc_handler   = &proc_dointvec_minmax,
+                .strategy       = &sysctl_intvec,
+                .extra1         = &nr_pdflush_threads_min,
+                .extra2         = &one_thousand,
+        },
+        {
                 .ctl_name       = VM_SWAPPINESS,
                 .procname       = "swappiness",
                 .data           = &vm_swappiness,
@@ -1373,10 +1415,7 @@ static struct ctl_table fs_table[] = {
                 .data           = &lease_break_time,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
-                .extra1         = &zero,
-                .extra2         = &two,
+                .proc_handler   = &proc_dointvec,
         },
 #endif
 #ifdef CONFIG_AIO
@@ -1417,7 +1456,10 @@ static struct ctl_table fs_table[] = {
                 .data           = &suid_dumpable,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = &proc_dointvec_minmax,
+                .strategy       = &sysctl_intvec,
+                .extra1         = &zero,
+                .extra2         = &two,
         },
 #if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE)
         {