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);