From eba319a0f72290f0b478175e4727b13d2ed744e8 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 27 Apr 2010 21:22:55 +0000
Subject: [PATCH] --- yaml --- r: 196623 b: refs/heads/master c:
 75c1d539ea13117cbe95e2c343e52af67d735145 h: refs/heads/master i:   196621:
 5971705eb0dfa40459ecf5ebeeadc967c8c8348a   196619:
 4d251e6e8135c975e6635b77712bc59ff3120728   196615:
 c62bfd1c9da8c4c80b13e822126ab65164811cd4   196607:
 01bac5e5a8414a3908aa50d1e83fbc56ad7584c3 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/powerpc/mm/pgtable_32.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 648c3d24830e..4d00516f1dcd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aef40e87d866355ffd279ab21021de733242d0d5
+refs/heads/master: 75c1d539ea13117cbe95e2c343e52af67d735145
diff --git a/trunk/arch/powerpc/mm/pgtable_32.c b/trunk/arch/powerpc/mm/pgtable_32.c
index 767b0cf17d33..9fc02dc72ce9 100644
--- a/trunk/arch/powerpc/mm/pgtable_32.c
+++ b/trunk/arch/powerpc/mm/pgtable_32.c
@@ -393,11 +393,7 @@ static int __change_page_attr(struct page *page, pgprot_t prot)
 		return -EINVAL;
 	__set_pte_at(&init_mm, address, kpte, mk_pte(page, prot), 0);
 	wmb();
-#ifdef CONFIG_PPC_STD_MMU
-	flush_hash_pages(0, address, pmd_val(*kpmd), 1);
-#else
 	flush_tlb_page(NULL, address);
-#endif
 	pte_unmap(kpte);
 
 	return 0;