Merge branch 'android-4.14-spl-topic' into exynos9609

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / kernel / sysctl.c

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index a536801c957b2c3037d1830d015c98efe394e935..f9291b0effc2cdfbd7a12a2d489808d318139001 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -30,7 +30,6 @@
 #include <linux/proc_fs.h>
 #include <linux/security.h>
 #include <linux/ctype.h>
-#include <linux/kmemcheck.h>
 #include <linux/kmemleak.h>
 #include <linux/fs.h>
 #include <linux/init.h>
@@ -106,6 +105,7 @@ extern char core_pattern[];
 extern unsigned int core_pipe_limit;
 #endif
 extern int pid_max;
+extern int extra_free_kbytes;
 extern int pid_max_min, pid_max_max;
 extern int percpu_pagelist_fraction;
 extern int latencytop_enabled;
@@ -1217,15 +1217,6 @@ static struct ctl_table kern_table[] = {
                .extra1         = &zero,
                .extra2         = &one_thousand,
        },
-#endif
-#ifdef CONFIG_KMEMCHECK
-       {
-               .procname       = "kmemcheck",
-               .data           = &kmemcheck_enabled,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = proc_dointvec,
-       },
 #endif
        {
                .procname       = "panic_on_warn",
@@ -1499,6 +1490,14 @@ static struct ctl_table vm_table[] = {
                .extra1         = &one,
                .extra2         = &one_thousand,
        },
+       {
+               .procname       = "extra_free_kbytes",
+               .data           = &extra_free_kbytes,
+               .maxlen         = sizeof(extra_free_kbytes),
+               .mode           = 0644,
+               .proc_handler   = min_free_kbytes_sysctl_handler,
+               .extra1         = &zero,
+       },
        {
                .procname       = "percpu_pagelist_fraction",
                .data           = &percpu_pagelist_fraction,