2 files changed, 5 insertions, 2 deletions

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index cb99a42f8b37..c74f03bc0144 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -878,7 +878,8 @@ static ctl_table vm_table[] = {
                 .maxlen         = sizeof(zone_reclaim_mode),
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec,
-                .strategy       = &zero,
+                .strategy       = &sysctl_intvec,
+                .extra1         = &zero,
         },
 #endif
         { .ctl_name = 0 }
diff --git a/mm/vmscan.c b/mm/vmscan.c
index a29efb2c06c8..61ca0097c834 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1636,14 +1636,16 @@ int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order)
         p->flags |= PF_MEMALLOC;
         reclaim_state.reclaimed_slab = 0;
         p->reclaim_state = &reclaim_state;
+
         shrink_zone(zone, &sc);
+
         p->reclaim_state = NULL;
         current->flags &= ~PF_MEMALLOC;
 
         if (sc.nr_reclaimed == 0)
                 zone->last_unsuccessful_zone_reclaim = jiffies;
 
-        return sc.nr_reclaimed > nr_pages;
+        return sc.nr_reclaimed >= nr_pages;
 }
 #endif