diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2005-05-25 14:58:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-05-25 14:58:04 -0700 |
| commit | 4b463f785837f73bdd88ae3821bb7b69599010c9 (patch) | |
| tree | 80dc0a7e3e33596ff3ece410d9ff9e6b63e45b87 /mm | |
| parent | 6df16d0c35b9c0d3627f30c106e6142d3d12662b (diff) | |
| parent | 384f1fcd2db8bc5a15f20f10793d8e1c82acd6c5 (diff) | |
Merge of /home/davem/src/GIT/linux-2.6/.git/
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/rmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/rmap.c b/mm/rmap.c index a6203b4e127..9827409eb7c 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -626,7 +626,7 @@ static void try_to_unmap_cluster(unsigned long cursor, pgd_t *pgd; pud_t *pud; pmd_t *pmd; - pte_t *pte; + pte_t *pte, *original_pte; pte_t pteval; struct page *page; unsigned long address; @@ -658,7 +658,7 @@ static void try_to_unmap_cluster(unsigned long cursor, if (!pmd_present(*pmd)) goto out_unlock; - for (pte = pte_offset_map(pmd, address); + for (original_pte = pte = pte_offset_map(pmd, address); address < end; pte++, address += PAGE_SIZE) { if (!pte_present(*pte)) @@ -694,7 +694,7 @@ static void try_to_unmap_cluster(unsigned long cursor, (*mapcount)--; } - pte_unmap(pte); + pte_unmap(original_pte); out_unlock: spin_unlock(&mm->page_table_lock); } |