Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

arch/arm/mm/pgd.c

+2 −4
Original line number Diff line number Diff line
@@ -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: