---

yaml --- r: 207240 b: refs/heads/master c: b00d3ea h: refs/heads/master v: v3
git-mirror · Aug 10, 2010 · 67f989a · 67f989a
1 parent 9ed12a5
commit 67f989a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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