From 1e7074352914d9d1ca36bc6a69f8027f7e089a1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
Date: Mon, 6 Apr 2009 15:12:53 -0700
Subject: [PATCH] --- yaml --- r: 143641 b: refs/heads/master c:
 1d8cbcf5d66b1f23f776a2c10ef9574a338cd109 h: refs/heads/master i:   143639:
 4b9e3bdd62ed22d546067d7a71a96c56668e4d86 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/staging/android/binder.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0a6ef3fd40e9..626c1df71c9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20aa9e9b5465a2566e23d78643735dfae3277dab
+refs/heads/master: 1d8cbcf5d66b1f23f776a2c10ef9574a338cd109
diff --git a/trunk/drivers/staging/android/binder.c b/trunk/drivers/staging/android/binder.c
index 79e90fed27d3..b62cd2aae874 100644
--- a/trunk/drivers/staging/android/binder.c
+++ b/trunk/drivers/staging/android/binder.c
@@ -54,11 +54,7 @@ static int binder_read_proc_proc(
 #define SZ_4M                               0x400000
 #endif
 
-#ifndef __i386__
-#define FORBIDDEN_MMAP_FLAGS                (VM_WRITE | VM_EXEC)
-#else
 #define FORBIDDEN_MMAP_FLAGS                (VM_WRITE)
-#endif
 
 #define BINDER_SMALL_BUF_SIZE (PAGE_SIZE * 64)