diff --git a/[refs] b/[refs]
index 19e1162685e8..bea499af55ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 597f95e2bfbe9b83ed8b0761ebf4e7d55fd4df17
+refs/heads/master: 8913ca1c9ccb5eb6471afd419159729eef6e2730
diff --git a/trunk/arch/ppc64/mm/hash_low.S b/trunk/arch/ppc64/mm/hash_low.S
index fbff24827ae7..35eb49e1b890 100644
--- a/trunk/arch/ppc64/mm/hash_low.S
+++ b/trunk/arch/ppc64/mm/hash_low.S
@@ -128,13 +128,11 @@ _GLOBAL(__hash_page)
 	/* We eventually do the icache sync here (maybe inline that
 	 * code rather than call a C function...) 
 	 */
-BEGIN_FTR_SECTION
 BEGIN_FTR_SECTION
 	mr	r4,r30
 	mr	r5,r7
 	bl	.hash_page_do_lazy_icache
-END_FTR_SECTION_IFSET(CPU_FTR_NOEXECUTE)
-END_FTR_SECTION_IFCLR(CPU_FTR_COHERENT_ICACHE)
+END_FTR_SECTION(CPU_FTR_NOEXECUTE|CPU_FTR_COHERENT_ICACHE, CPU_FTR_NOEXECUTE)
 
 	/* At this point, r3 contains new PP bits, save them in
 	 * place of "access" in the param area (sic)