1 files changed, 2 insertions, 2 deletions

diff --git a/mm/memory.c b/mm/memory.c
index 829d43735402..5e30583c2605 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -293,7 +293,7 @@ int __tlb_remove_page(struct mmu_gather *tlb, struct page *page)
 {
         struct mmu_gather_batch *batch;
 
-        tlb->need_flush = 1;
+        VM_BUG_ON(!tlb->need_flush);
 
         if (tlb_fast_mode(tlb)) {
                 free_page_and_swap_cache(page);
@@ -1231,7 +1231,7 @@ static inline unsigned long zap_pmd_range(struct mmu_gather *tlb,
                         if (next-addr != HPAGE_PMD_SIZE) {
                                 VM_BUG_ON(!rwsem_is_locked(&tlb->mm->mmap_sem));
                                 split_huge_page_pmd(vma->vm_mm, pmd);
-                        } else if (zap_huge_pmd(tlb, vma, pmd))
+                        } else if (zap_huge_pmd(tlb, vma, pmd, addr))
                                 continue;
                         /* fall through */
                 }