From: Christoph Lameter - If we only reclaim nr_pages then its okay to stay on node. Switch from > to >= for the comparison. - vm_table[] entry for zone_reclaim_mode is a bit screwed up. - Add empty lines around shrink_zone to show that this is the central function to be called. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton --- kernel/sysctl.c | 3 ++- mm/vmscan.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff -puN kernel/sysctl.c~zone_reclaim-minor-fixes kernel/sysctl.c --- devel/kernel/sysctl.c~zone_reclaim-minor-fixes 2006-01-22 21:57:44.000000000 -0800 +++ devel-akpm/kernel/sysctl.c 2006-01-22 21:57:44.000000000 -0800 @@ -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 -puN mm/vmscan.c~zone_reclaim-minor-fixes mm/vmscan.c --- devel/mm/vmscan.c~zone_reclaim-minor-fixes 2006-01-22 21:57:44.000000000 -0800 +++ devel-akpm/mm/vmscan.c 2006-01-22 21:57:44.000000000 -0800 @@ -1636,14 +1636,16 @@ int zone_reclaim(struct zone *zone, gfp_ 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 _