commit 23fd07750a789a66fe88cf173d52a18f1a387da4
author Paul Mackerras <paulus@samba.org> Mon Oct 31 13:37:12 2005 +1100
committer Paul Mackerras <paulus@samba.org> Mon Oct 31 13:37:12 2005 +1100
tree 06fdd6df35fdb835abdaa9b754d62f6b84b97250
parent bd787d438a59266af3c9f6351644c85ef1dd21fe
parent ed28f96ac1960f30f818374d65be71d2fdf811b0

Merge ../linux-2.6 by hand

arch/powerpc/mm/pgtable_64.c

diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index 484d24f..b79a782 100644
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -104,7 +104,6 @@
 	unsigned long vsid;
 
 	if (mem_init_done) {
-		spin_lock(&init_mm.page_table_lock);
 		pgdp = pgd_offset_k(ea);
 		pudp = pud_alloc(&init_mm, pgdp, ea);
 		if (!pudp)
@@ -112,12 +111,11 @@
 		pmdp = pmd_alloc(&init_mm, pudp, ea);
 		if (!pmdp)
 			return -ENOMEM;
-		ptep = pte_alloc_kernel(&init_mm, pmdp, ea);
+		ptep = pte_alloc_kernel(pmdp, ea);
 		if (!ptep)
 			return -ENOMEM;
 		set_pte_at(&init_mm, ea, ptep, pfn_pte(pa >> PAGE_SHIFT,
 							  __pgprot(flags)));
-		spin_unlock(&init_mm.page_table_lock);
 	} else {
 		unsigned long va, vpn, hash, hpteg;