diff options
| author | Jeff Garzik | 2006-03-20 10:38:03 +0100 |
|---|---|---|
| committer | Jeff Garzik | 2006-03-20 10:38:03 +0100 |
| commit | d378aca6ec708bfb24df5c47801b1f2399efc481 (patch) | |
| tree | 7535f96bf34314df071698d2e06054b8d5223ebb /mm/memory.c | |
| parent | Merge branch 'upstream-fixes' (diff) | |
| parent | Linux 2.6.16 (diff) | |
| download | kernel-qcow2-linux-d378aca6ec708bfb24df5c47801b1f2399efc481.tar.gz kernel-qcow2-linux-d378aca6ec708bfb24df5c47801b1f2399efc481.tar.xz kernel-qcow2-linux-d378aca6ec708bfb24df5c47801b1f2399efc481.zip | |
Merge branch 'master'
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c index 9abc6008544b..85e80a57db29 100644 --- a/mm/memory.c +++ b/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) { /* |