From 8f40a97f6d1dab8479f7ea73be5d8b72f2709bf4 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 23 Sep 2005 13:24:07 -0700
Subject: [PATCH] --- yaml --- r: 9273 b: refs/heads/master c:
 67b108131df1230bad20a7279a8897de123d690b h: refs/heads/master i:   9271:
 cfc9dce76869d6f324b9e2b87af08a78f20bf2ad v: v3

---
 [refs]                            | 2 +-
 trunk/arch/ppc64/mm/hash_native.c | 5 ++---
 trunk/arch/ppc64/mm/hugetlbpage.c | 7 +++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 3a79272c33ef..beecaaff1f50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2601c2e278863cd48c01bce1377b4c9747893025
+refs/heads/master: 67b108131df1230bad20a7279a8897de123d690b
diff --git a/trunk/arch/ppc64/mm/hash_native.c b/trunk/arch/ppc64/mm/hash_native.c
index 7626bb59954d..eb1bbb5b6c16 100644
--- a/trunk/arch/ppc64/mm/hash_native.c
+++ b/trunk/arch/ppc64/mm/hash_native.c
@@ -343,9 +343,7 @@ static void native_flush_hash_range(unsigned long context,
 	hpte_t *hptep;
 	unsigned long hpte_v;
 	struct ppc64_tlb_batch *batch = &__get_cpu_var(ppc64_tlb_batch);
-
-	/* XXX fix for large ptes */
-	unsigned long large = 0;
+	unsigned long large;
 
 	local_irq_save(flags);
 
@@ -358,6 +356,7 @@ static void native_flush_hash_range(unsigned long context,
 
 		va = (vsid << 28) | (batch->addr[i] & 0x0fffffff);
 		batch->vaddr[j] = va;
+		large = pte_huge(batch->pte[i]);
 		if (large)
 			vpn = va >> HPAGE_SHIFT;
 		else
diff --git a/trunk/arch/ppc64/mm/hugetlbpage.c b/trunk/arch/ppc64/mm/hugetlbpage.c
index 338771ec70d7..0ea0994ed974 100644
--- a/trunk/arch/ppc64/mm/hugetlbpage.c
+++ b/trunk/arch/ppc64/mm/hugetlbpage.c
@@ -710,10 +710,13 @@ int hash_huge_page(struct mm_struct *mm, unsigned long access,
 			hpte_group = ((~hash & htab_hash_mask) *
 				      HPTES_PER_GROUP) & ~0x7UL; 
 			slot = ppc_md.hpte_insert(hpte_group, va, prpn,
-						  HPTE_V_LARGE, rflags);
+						  HPTE_V_LARGE |
+						  HPTE_V_SECONDARY,
+						  rflags);
 			if (slot == -1) {
 				if (mftb() & 0x1)
-					hpte_group = ((hash & htab_hash_mask) * HPTES_PER_GROUP) & ~0x7UL;
+					hpte_group = ((hash & htab_hash_mask) *
+						      HPTES_PER_GROUP)&~0x7UL;
 
 				ppc_md.hpte_remove(hpte_group);
 				goto repeat;