diff options
| author | merge <null@invalid> | 2008-11-27 08:37:56 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-27 08:37:56 +0000 |
| commit | a560d8579b4b009f847972667b7597c89030e26c (patch) | |
| tree | 31dc5e17d93057b2e9290720a8b1f453201dead2 /drivers/android/binder.c | |
| parent | e21ce7019cc3b9495be8678ef2c41569cc03021e (diff) | |
MERGE-via-balaji-tracking-hist-MERGE-via-stable-tracking-hist-config-gta02-uplevel-patch
balaji-tracking-hist top was MERGE-via-stable-tracking-hist-config-gta02-uplevel-patch / eb381acecca375d0a7b88cfe640504a8a1fa4c39 ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-stable-tracking-hist-config-gta02-uplevel-patch
stable-tracking-hist top was config-gta02-uplevel-patch / 0e07e39074bbdb938cfefaea6ad7823282cc914c ... parent commitmessage:
From: Andy Green <andy@openmoko.com>
config-gta02-uplevel.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/android/binder.c')
| -rw-r--r-- | drivers/android/binder.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index a6a8380c6d1..80a96bef392 100644 --- a/drivers/android/binder.c +++ b/drivers/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) |