1 files changed, 40 insertions, 8 deletions

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index b53115b882e1..cb99a42f8b37 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -25,12 +25,14 @@
 #include <linux/slab.h>
 #include <linux/sysctl.h>
 #include <linux/proc_fs.h>
+#include <linux/capability.h>
 #include <linux/ctype.h>
 #include <linux/utsname.h>
 #include <linux/capability.h>
 #include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/kobject.h>
 #include <linux/net.h>
 #include <linux/sysrq.h>
 #include <linux/highuid.h>
@@ -67,6 +69,8 @@ extern int min_free_kbytes;
 extern int printk_ratelimit_jiffies;
 extern int printk_ratelimit_burst;
 extern int pid_max_min, pid_max_max;
+extern int sysctl_drop_caches;
+extern int percpu_pagelist_fraction;
 
 #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86)
 int unknown_nmi_panic;
@@ -77,15 +81,13 @@ extern int proc_unknown_nmi_panic(ctl_table *, int, struct file *,
 /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
 static int maxolduid = 65535;
 static int minolduid;
+static int min_percpu_pagelist_fract = 8;
 
 static int ngroups_max = NGROUPS_MAX;
 
 #ifdef CONFIG_KMOD
 extern char modprobe_path[];
 #endif
-#ifdef CONFIG_HOTPLUG
-extern char hotplug_path[];
-#endif
 #ifdef CONFIG_CHR_DEV_SG
 extern int sg_big_buff;
 #endif
@@ -110,7 +112,7 @@ extern int pwrsw_enabled;
 extern int unaligned_enabled;
 #endif
 
-#ifdef CONFIG_ARCH_S390
+#ifdef CONFIG_S390
 #ifdef CONFIG_MATHEMU
 extern int sysctl_ieee_emulation_warnings;
 #endif
@@ -397,8 +399,8 @@ static ctl_table kern_table[] = {
         {
                 .ctl_name       = KERN_HOTPLUG,
                 .procname       = "hotplug",
-                .data           = &hotplug_path,
-                .maxlen         = HOTPLUG_PATH_LEN,
+                .data           = &uevent_helper,
+                .maxlen         = UEVENT_HELPER_PATH_LEN,
                 .mode           = 0644,
                 .proc_handler   = &proc_dostring,
                 .strategy       = &sysctl_string,
@@ -544,7 +546,7 @@ static ctl_table kern_table[] = {
                 .extra1         = &minolduid,
                 .extra2         = &maxolduid,
         },
-#ifdef CONFIG_ARCH_S390
+#ifdef CONFIG_S390
 #ifdef CONFIG_MATHEMU
         {
                 .ctl_name       = KERN_IEEE_EMULATION_WARNINGS,
@@ -646,7 +648,7 @@ static ctl_table kern_table[] = {
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec,
         },
-#if defined(CONFIG_ARCH_S390)
+#if defined(CONFIG_S390) && defined(CONFIG_SMP)
         {
                 .ctl_name       = KERN_SPIN_RETRY,
                 .procname       = "spin_retry",
@@ -777,6 +779,15 @@ static ctl_table vm_table[] = {
                 .strategy       = &sysctl_intvec,
         },
         {
+                .ctl_name       = VM_DROP_PAGECACHE,
+                .procname       = "drop_caches",
+                .data           = &sysctl_drop_caches,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = drop_caches_sysctl_handler,
+                .strategy       = &sysctl_intvec,
+        },
+        {
                 .ctl_name       = VM_MIN_FREE_KBYTES,
                 .procname       = "min_free_kbytes",
                 .data           = &min_free_kbytes,
@@ -786,6 +797,16 @@ static ctl_table vm_table[] = {
                 .strategy       = &sysctl_intvec,
                 .extra1         = &zero,
         },
+        {
+                .ctl_name       = VM_PERCPU_PAGELIST_FRACTION,
+                .procname       = "percpu_pagelist_fraction",
+                .data           = &percpu_pagelist_fraction,
+                .maxlen         = sizeof(percpu_pagelist_fraction),
+                .mode           = 0644,
+                .proc_handler   = &percpu_pagelist_fraction_sysctl_handler,
+                .strategy       = &sysctl_intvec,
+                .extra1         = &min_percpu_pagelist_fract,
+        },
 #ifdef CONFIG_MMU
         {
                 .ctl_name       = VM_MAX_MAP_COUNT,
@@ -849,6 +870,17 @@ static ctl_table vm_table[] = {
                 .strategy       = &sysctl_jiffies,
         },
 #endif
+#ifdef CONFIG_NUMA
+        {
+                .ctl_name       = VM_ZONE_RECLAIM_MODE,
+                .procname       = "zone_reclaim_mode",
+                .data           = &zone_reclaim_mode,
+                .maxlen         = sizeof(zone_reclaim_mode),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec,
+                .strategy       = &zero,
+        },
+#endif
         { .ctl_name = 0 }
 };