diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-17 11:59:33 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-17 11:59:33 +1100 |
| commit | 4bd05fdcf51f31bca3a44ae789a19a275c24a608 (patch) | |
| tree | 201051266295f0803f81fc2502852655d7b3b2b8 /fs | |
| parent | 558686eab5c75f10242d0ab96fbfa78998d9442b (diff) | |
| parent | ecc793f04b9284811ad8c6b1f930ba0a30744adb (diff) | |
Merge commit 's390/features'
Conflicts:
drivers/char/Makefile
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/binfmt_elf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 8fcfa398d350..95a76ff9e01b 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -949,7 +949,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) set_binfmt(&elf_format); #ifdef ARCH_HAS_SETUP_ADDITIONAL_PAGES - retval = arch_setup_additional_pages(bprm, executable_stack); + retval = arch_setup_additional_pages(bprm, !!elf_interpreter); if (retval < 0) { send_sig(SIGKILL, current, 0); goto out; |