[PATCH 2/19] powerpc: TLB insertion cleanup

[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>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
---

Index: linux-powerpc-git/arch/powerpc/mm/hugetlbpage.c
diff -u linux-powerpc-git/arch/powerpc/mm/hugetlbpage.c:1.1.1.3 linux-powerpc-git/arch/powerpc/mm/hugetlbpage.c:1.4
--- linux-powerpc-git/arch/powerpc/mm/hugetlbpage.c:1.1.1.3	Thu Jan 11 11:16:30 2007
+++ linux-powerpc-git/arch/powerpc/mm/hugetlbpage.c	Thu Jan 11 13:50:43 2007
@@ -1014,7 +1014,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,
@@ -1033,7 +1032,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);
 	}
 
 	/*