diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-31 04:40:03 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-31 04:40:03 +0100 |
| commit | e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (patch) | |
| tree | 31af81b6f7dfe1c9da4280e49d8b9777010ce1e7 /arch/powerpc | |
| parent | powerpc: apply recent changes to merged code (diff) | |
| download | linux-e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc.tar.xz linux-e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc.zip | |
powerpc: import a fix from arch/ppc/mm/pgtable.c
... namely, the change to the 2-argument pte_alloc_kernel.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/mm/pgtable_32.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c index f54fb9d3927a..f4e5ac122615 100644 --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c @@ -279,18 +279,16 @@ map_page(unsigned long va, phys_addr_t pa, int flags) pte_t *pg; int err = -ENOMEM; - spin_lock(&init_mm.page_table_lock); /* Use upper 10 bits of VA to index the first level map */ pd = pmd_offset(pgd_offset_k(va), va); /* Use middle 10 bits of VA to index the second-level map */ - pg = pte_alloc_kernel(&init_mm, pd, va); + pg = pte_alloc_kernel(pd, va); if (pg != 0) { err = 0; set_pte_at(&init_mm, va, pg, pfn_pte(pa >> PAGE_SHIFT, __pgprot(flags))); if (mem_init_done) flush_HPTE(0, va, pmd_val(*pd)); } - spin_unlock(&init_mm.page_table_lock); return err; } |