From f180f8029ad4ad8fd54c9b414c50169786db004f Mon Sep 17 00:00:00 2001
From: Shaohua Li <shaohua.li@intel.com>
Date: Fri, 8 Jul 2011 15:39:41 -0700
Subject: [PATCH] --- yaml --- r: 254743 b: refs/heads/master c:
 0b43c3aab0137595335b08b340a3f3e5af9818a6 h: refs/heads/master i:   254741:
 5572503a39ff9c00c1aa9dab545eed88e57b0902   254739:
 d800323f3a5a680767cdda601b4e563d8c31eff0   254735:
 a95f2b220852c378ab9fdcdd342177b61ae319f1 v: v3

---
 [refs]            | 2 +-
 trunk/mm/memory.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f5aa7e89f511..50d9d688cf9f 100644
--- 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
index 40b7531ee8ba..9b8a01d941cb 100644
--- 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);