From ab076b7ca51d8000adc41f5657df2653a4d1ca67 Mon Sep 17 00:00:00 2001
From: Scott Wood <scottwood@freescale.com>
Date: Wed, 6 Feb 2008 06:43:26 +1100
Subject: [PATCH] --- yaml --- r: 83946 b: refs/heads/master c:
 551ed332da2f52daf5d01fc76d2a894aba79d316 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/powerpc/mm/mem.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 87b45cec8f5e..85bbcf29fee3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5903ede0015db5b53458092b6ae2af074fa49d4
+refs/heads/master: 551ed332da2f52daf5d01fc76d2a894aba79d316
diff --git a/trunk/arch/powerpc/mm/mem.c b/trunk/arch/powerpc/mm/mem.c
index e8122447f019..c7d7bd43a251 100644
--- a/trunk/arch/powerpc/mm/mem.c
+++ b/trunk/arch/powerpc/mm/mem.c
@@ -483,7 +483,12 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,
 		 */
 		_tlbie(address, 0 /* 8xx doesn't care about PID */);
 #endif
-		if (!PageReserved(page)
+		/* The _PAGE_USER test should really be _PAGE_EXEC, but
+		 * older glibc versions execute some code from no-exec
+		 * pages, which for now we are supporting.  If exec-only
+		 * pages are ever implemented, this will have to change.
+		 */
+		if (!PageReserved(page) && (pte_val(pte) & _PAGE_USER)
 		    && !test_bit(PG_arch_1, &page->flags)) {
 			if (vma->vm_mm == current->active_mm) {
 				__flush_dcache_icache((void *) address);