diff options
author | Colin Cross <ccross@android.com> | 2011-07-12 20:10:37 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2011-07-12 20:10:37 -0700 |
commit | 75c56a81116e51c5cf15c0641906d0745188cd16 (patch) | |
tree | c1d8e7def5bbb099a39d5e9ccfb13508ea5ca46a /mm/memory.c | |
parent | b4294d618e8a19bb47826e51ae52b9fb2fe05f80 (diff) | |
parent | 620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc (diff) |
Merge commit 'v3.0-rc7' into android-3.0
Diffstat (limited to 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/memory.c b/mm/memory.c index 40b7531ee8ba..9b8a01d941cb 100644 --- a/mm/memory.c +++ b/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); |