diff --git a/[refs] b/[refs] index 72d0e0bddf2f..3294200e13c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f446daaea9d4a420d16c606f755f3689dcb2d0ce +refs/heads/master: b00d3ea7cfe44e177ad5cd8141209d46478a7a51 diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index b94fe1b3da43..5b594d62ca01 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/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