---

yaml --- r: 254743 b: refs/heads/master c: 0b43c3a h: refs/heads/master i: 254741: 5572503 254739: d800323 254735: a95f2b2 v: v3
git-mirror · Jul 9, 2011 · f180f80 · f180f80
1 parent 360c781
commit f180f80
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 215ddd6664ced067afca7eebd2d1eb83f064ff5a
+refs/heads/master: 0b43c3aab0137595335b08b340a3f3e5af9818a6
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
@@ -305,6 +305,7 @@ int __tlb_remove_page(struct mmu_gather *tlb, struct page *page)
 	if (batch->nr == batch->max) {
 		if (!tlb_next_batch(tlb))
 			return 0;
+		batch = tlb->active;
 	}
 	VM_BUG_ON(batch->nr > batch->max);