diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-06 15:42:07 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-06 15:42:07 -0700 |
| commit | 26abd53d8e9e51bbeea0b4772e8dffece3eeff38 (patch) | |
| tree | d9dc6f45c9142e6a8f58f1aa8fc75e66f9edd0e9 /fs/binfmt_flat.c | |
| parent | ff89bf3bc0534aa03b5375aa906544d96911bad4 (diff) | |
| parent | 8f5bb0438b86d1a5393176ceeec2836fd469edf8 (diff) | |
| download | kernel_samsung_smdk4412-26abd53d8e9e51bbeea0b4772e8dffece3eeff38.zip kernel_samsung_smdk4412-26abd53d8e9e51bbeea0b4772e8dffece3eeff38.tar.gz kernel_samsung_smdk4412-26abd53d8e9e51bbeea0b4772e8dffece3eeff38.tar.bz2 | |
auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'fs/binfmt_flat.c')
| -rw-r--r-- | fs/binfmt_flat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index f0cd67d..c8998dc 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c @@ -520,7 +520,7 @@ static int load_flat_file(struct linux_binprm * bprm, DBG_FLT("BINFMT_FLAT: ROM mapping of file (we hope)\n"); down_write(¤t->mm->mmap_sem); - textpos = do_mmap(bprm->file, 0, text_len, PROT_READ|PROT_EXEC, 0, 0); + textpos = do_mmap(bprm->file, 0, text_len, PROT_READ|PROT_EXEC, MAP_SHARED, 0); up_write(¤t->mm->mmap_sem); if (!textpos || textpos >= (unsigned long) -4096) { if (!textpos) @@ -532,7 +532,7 @@ static int load_flat_file(struct linux_binprm * bprm, down_write(¤t->mm->mmap_sem); realdatastart = do_mmap(0, 0, data_len + extra + MAX_SHARED_LIBS * sizeof(unsigned long), - PROT_READ|PROT_WRITE|PROT_EXEC, 0, 0); + PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE, 0); up_write(¤t->mm->mmap_sem); if (realdatastart == 0 || realdatastart >= (unsigned long)-4096) { @@ -574,7 +574,7 @@ static int load_flat_file(struct linux_binprm * bprm, down_write(¤t->mm->mmap_sem); textpos = do_mmap(0, 0, text_len + data_len + extra + MAX_SHARED_LIBS * sizeof(unsigned long), - PROT_READ | PROT_EXEC | PROT_WRITE, 0, 0); + PROT_READ | PROT_EXEC | PROT_WRITE, MAP_PRIVATE, 0); up_write(¤t->mm->mmap_sem); if (!textpos || textpos >= (unsigned long) -4096) { if (!textpos) |