diff --git a/[refs] b/[refs] index 807266e1e7a7..9702622640cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7670f023aabd976c25862e4c6fb9f6d9d2758153 +refs/heads/master: 6f5e6b9e69bf043074a0edabe3d271899c34eb79 diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c index 9abc6008544b..85e80a57db29 100644 --- a/trunk/mm/memory.c +++ b/trunk/mm/memory.c @@ -623,11 +623,12 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, (*zap_work)--; continue; } + + (*zap_work) -= PAGE_SIZE; + if (pte_present(ptent)) { struct page *page; - (*zap_work) -= PAGE_SIZE; - page = vm_normal_page(vma, addr, ptent); if (unlikely(details) && page) { /*