diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-03 10:47:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-03 10:47:52 -0800 |
| commit | cad226b8a71f969ad05137e43b48c9e6059a0b9f (patch) | |
| tree | 80a72f385ea28f9f7649363fe5147b3da37f9950 | |
| parent | 7105a387a8ac9b512b900efd5ff7a97acc44fb39 (diff) | |
| parent | 0c82d83cb09a1c9fd4d24d32064ce827709c104b (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Fix freeing of page tables for ARM in free_pgd_slow
| -rw-r--r-- | arch/arm/mm/pgd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mm/pgd.c b/arch/arm/mm/pgd.c index 500c9610ab30..e0f19ab91163 100644 --- a/arch/arm/mm/pgd.c +++ b/arch/arm/mm/pgd.c @@ -75,7 +75,7 @@ no_pgd: void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd) { pmd_t *pmd; - struct page *pte; + pgtable_t pte; if (!pgd) return; @@ -90,10 +90,8 @@ void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd) goto free; } - pte = pmd_page(*pmd); + pte = pmd_pgtable(*pmd); pmd_clear(pmd); - dec_zone_page_state(virt_to_page((unsigned long *)pgd), NR_PAGETABLE); - pte_lock_deinit(pte); pte_free(mm, pte); pmd_free(mm, pmd); free: |