[PATCH 15/15] powerpc: TLB insert

[Ishizaki Kou]

This patch changes handling return value of ppc_md.hpte_insert() into
the same way as __hash_page_*().

Signed-off-by: Kou Ishizaki <kou.ishizaki at toshiba.co.jp>
---

Index: linux-powerpc-git/arch/powerpc/mm/hugetlbpage.c
diff -u linux-powerpc-git/arch/powerpc/mm/hugetlbpage.c:1.1.1.1 linux-powerpc-git/arch/powerpc/mm/hugetlbpage.c:1.2
--- linux-powerpc-git/arch/powerpc/mm/hugetlbpage.c:1.1.1.1	Wed Dec  6 08:25:43 2006
+++ linux-powerpc-git/arch/powerpc/mm/hugetlbpage.c	Wed Dec  6 08:43:15 2006
@@ -1009,7 +1009,6 @@
 
 		/* Primary is full, try the secondary */
 		if (unlikely(slot == -1)) {
-			new_pte |= _PAGE_F_SECOND;
 			hpte_group = ((~hash & htab_hash_mask) *
 				      HPTES_PER_GROUP) & ~0x7UL; 
 			slot = ppc_md.hpte_insert(hpte_group, va, pa, rflags,
@@ -1028,7 +1027,7 @@
 		if (unlikely(slot == -2))
 			panic("hash_huge_page: pte_insert failed\n");
 
-		new_pte |= (slot << 12) & _PAGE_F_GIX;
+		new_pte |= (slot << 12) & (_PAGE_F_SECOND | _PAGE_F_GIX);
 	}
 
 	/*