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

Commit 7ce774b4 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds
Browse files

[PATCH] mm: powerpc init_mm without ptlock 



Restore an earlier mod which went missing in the powerpc reshuffle: the 4xx
mmu_mapin_ram does not need to take init_mm.page_table_lock.

Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 01edcd89

arch/powerpc/mm/4xx_mmu.c

+0 −4
Original line number Diff line number Diff line
@@ -110,13 +110,11 @@ unsigned long __init mmu_mapin_ram(void) 
		pmd_t *pmdp;

		unsigned long val = p | _PMD_SIZE_16M | _PAGE_HWEXEC | _PAGE_HWWRITE;



		spin_lock(&init_mm.page_table_lock);

		pmdp = pmd_offset(pgd_offset_k(v), v);

		pmd_val(*pmdp++) = val;

		pmd_val(*pmdp++) = val;

		pmd_val(*pmdp++) = val;

		pmd_val(*pmdp++) = val;

		spin_unlock(&init_mm.page_table_lock);



		v += LARGE_PAGE_SIZE_16M;

		p += LARGE_PAGE_SIZE_16M;
@@ -127,10 +125,8 @@ unsigned long __init mmu_mapin_ram(void) 
		pmd_t *pmdp;

		unsigned long val = p | _PMD_SIZE_4M | _PAGE_HWEXEC | _PAGE_HWWRITE;



		spin_lock(&init_mm.page_table_lock);

		pmdp = pmd_offset(pgd_offset_k(v), v);

		pmd_val(*pmdp) = val;

		spin_unlock(&init_mm.page_table_lock);



		v += LARGE_PAGE_SIZE_4M;

		p += LARGE_PAGE_SIZE_4M;