aboutsummaryrefslogtreecommitdiffstats
path: root/mm/vmscan.c
diff options
context:
space:
mode:
authorKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>2010-08-10 00:19:13 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-10 03:44:59 (GMT)
commitb00d3ea7cfe44e177ad5cd8141209d46478a7a51 (patch)
tree3508bd3106e6a83decd6e0db7521180e11d4754e /mm/vmscan.c
parentf446daaea9d4a420d16c606f755f3689dcb2d0ce (diff)
vmscan: zone_reclaim don't call disable_swap_token()
Swap token don't works when zone reclaim is enabled since it was born. Because __zone_reclaim() always call disable_swap_token() unconditionally. This kill swap token feature completely. As far as I know, nobody want to that. Remove it. Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Acked-by: Rik van Riel <riel@redhat.com> Reviewed-by: Minchan Kim <minchan.kim@gmail.com> Cc: Christoph Lameter <cl@linux-foundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r--mm/vmscan.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index b94fe1b..5b594d6 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -2592,7 +2592,6 @@ static int __zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order)
};
unsigned long slab_reclaimable;
- disable_swap_token();
cond_resched();
/*
* We need to be able to allocate from the reserves for RECLAIM_SWAP

Privacy Policy