Merge branch 'upstream-fixes'

1 files changed, 11 insertions, 1 deletions

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index cb99a42f8b37..71dd6f62efec 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -878,7 +878,17 @@ static ctl_table vm_table[] = {
                 .maxlen         = sizeof(zone_reclaim_mode),
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec,
-                .strategy       = &zero,
+                .strategy       = &sysctl_intvec,
+                .extra1         = &zero,
+        },
+        {
+                .ctl_name       = VM_ZONE_RECLAIM_INTERVAL,
+                .procname       = "zone_reclaim_interval",
+                .data           = &zone_reclaim_interval,
+                .maxlen         = sizeof(zone_reclaim_interval),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec_jiffies,
+                .strategy       = &sysctl_jiffies,
         },
 #endif
         { .ctl_name = 0 }