diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-14 15:35:28 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-14 15:35:28 +1100 |
| commit | f600c997a1e930c3be312fdc4d1a67979d89173e (patch) | |
| tree | 352f5d35d672887a5552730cb71af9d3f068fe19 /arch/tile/mm/elf.c | |
| parent | 065957b017e290977dc5527ae4e21cff9d3fb5ec (diff) | |
| parent | 0ef183f7f162a62662f6002b03bcf3ca2903c937 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/tile/mm/elf.c')
| -rw-r--r-- | arch/tile/mm/elf.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/tile/mm/elf.c b/arch/tile/mm/elf.c index 3cfa98bf9125..743c951c61b0 100644 --- a/arch/tile/mm/elf.c +++ b/arch/tile/mm/elf.c @@ -130,7 +130,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, if (!retval) { unsigned long addr = MEM_USER_INTRPT; addr = mmap_region(NULL, addr, INTRPT_SIZE, - MAP_FIXED|MAP_ANONYMOUS|MAP_PRIVATE, VM_READ|VM_EXEC| VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC, 0); if (addr > (unsigned long) -PAGE_SIZE) |