Commit 0c82d83c authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Russell King

[ARM] Fix freeing of page tables for ARM in free_pgd_slow

Since 2f569afd (CONFIG_HIGHPTE vs. sub-page page tables.) pte_free() calls
pte_lock_deinit() and dec_zone_page_state().  So free_pgd_slow must not call
the latter two when calling the first.
Signed-off-by: default avatarUwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d862ccc5
...@@ -75,7 +75,7 @@ pgd_t *get_pgd_slow(struct mm_struct *mm) ...@@ -75,7 +75,7 @@ pgd_t *get_pgd_slow(struct mm_struct *mm)
void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd) void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd)
{ {
pmd_t *pmd; pmd_t *pmd;
struct page *pte; pgtable_t pte;
if (!pgd) if (!pgd)
return; return;
...@@ -90,10 +90,8 @@ void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd) ...@@ -90,10 +90,8 @@ void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd)
goto free; goto free;
} }
pte = pmd_page(*pmd); pte = pmd_pgtable(*pmd);
pmd_clear(pmd); pmd_clear(pmd);
dec_zone_page_state(virt_to_page((unsigned long *)pgd), NR_PAGETABLE);
pte_lock_deinit(pte);
pte_free(mm, pte); pte_free(mm, pte);
pmd_free(mm, pmd); pmd_free(mm, pmd);
free: free:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment