Merge tag 'kbuild-fixes-v5.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / kernel / sysctl.c

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index d4a78e0..272f4a2 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -27,6 +27,7 @@
 #include <linux/sysctl.h>
 #include <linux/bitmap.h>
 #include <linux/signal.h>
+#include <linux/panic.h>
 #include <linux/printk.h>
 #include <linux/proc_fs.h>
 #include <linux/security.h>
@@ -71,6 +72,7 @@
 #include <linux/coredump.h>
 #include <linux/latencytop.h>
 #include <linux/pid.h>
+#include <linux/delayacct.h>
 
 #include "../lib/kstrtox.h"
 
@@ -1494,7 +1496,6 @@ int proc_do_large_bitmap(struct ctl_table *table, int write,
                         void *buffer, size_t *lenp, loff_t *ppos)
 {
        int err = 0;
-       bool first = 1;
        size_t left = *lenp;
        unsigned long bitmap_len = table->maxlen;
        unsigned long *bitmap = *(unsigned long **) table->data;
@@ -1579,12 +1580,12 @@ int proc_do_large_bitmap(struct ctl_table *table, int write,
                        }
 
                        bitmap_set(tmp_bitmap, val_a, val_b - val_a + 1);
-                       first = 0;
                        proc_skip_char(&p, &left, '\n');
                }
                left += skipped;
        } else {
                unsigned long bit_a, bit_b = 0;
+               bool first = 1;
 
                while (left) {
                        bit_a = find_next_bit(bitmap, bitmap_len, bit_b);
@@ -1747,6 +1748,17 @@ static struct ctl_table kern_table[] = {
                .extra2         = SYSCTL_ONE,
        },
 #endif /* CONFIG_SCHEDSTATS */
+#ifdef CONFIG_TASK_DELAY_ACCT
+       {
+               .procname       = "task_delayacct",
+               .data           = NULL,
+               .maxlen         = sizeof(unsigned int),
+               .mode           = 0644,
+               .proc_handler   = sysctl_delayacct,
+               .extra1         = SYSCTL_ZERO,
+               .extra2         = SYSCTL_ONE,
+       },
+#endif /* CONFIG_TASK_DELAY_ACCT */
 #ifdef CONFIG_NUMA_BALANCING
        {
                .procname       = "numa_balancing",
@@ -2909,11 +2921,11 @@ static struct ctl_table vm_table[] = {
                .extra2         = &one_thousand,
        },
        {
-               .procname       = "percpu_pagelist_fraction",
-               .data           = &percpu_pagelist_fraction,
-               .maxlen         = sizeof(percpu_pagelist_fraction),
+               .procname       = "percpu_pagelist_high_fraction",
+               .data           = &percpu_pagelist_high_fraction,
+               .maxlen         = sizeof(percpu_pagelist_high_fraction),
                .mode           = 0644,
-               .proc_handler   = percpu_pagelist_fraction_sysctl_handler,
+               .proc_handler   = percpu_pagelist_high_fraction_sysctl_handler,
                .extra1         = SYSCTL_ZERO,
        },
        {
@@ -2950,14 +2962,6 @@ static struct ctl_table vm_table[] = {
                .mode           = 0644,
                .proc_handler   = proc_dointvec_jiffies,
        },
-       {
-               .procname       = "block_dump",
-               .data           = &block_dump,
-               .maxlen         = sizeof(block_dump),
-               .mode           = 0644,
-               .proc_handler   = proc_dointvec_minmax,
-               .extra1         = SYSCTL_ZERO,
-       },
        {
                .procname       = "vfs_cache_pressure",
                .data           = &sysctl_vfs_cache_pressure,