diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
| commit | 325a479c4c110db278ef3361460a48c4093252cc (patch) | |
| tree | bcfbf4d0647d9442045639a5c19da59d55190e81 /fs/binfmt_elf.c | |
| parent | ebcc80c1b6629a445f7471cc1ddb48faf8a84e70 (diff) | |
| parent | 7f9eaedf894dbaa08c157832e9a6c9c03ffed1ed (diff) | |
Merge with temp tree to get David's gdb inferior calls patch
Diffstat (limited to 'fs/binfmt_elf.c')
| -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 6ae62cbf7c2e..ce9423bb2de3 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c | |||
| @@ -945,7 +945,7 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs) | |||
| 945 | retval = arch_setup_additional_pages(bprm, executable_stack); | 945 | retval = arch_setup_additional_pages(bprm, executable_stack); |
| 946 | if (retval < 0) { | 946 | if (retval < 0) { |
| 947 | send_sig(SIGKILL, current, 0); | 947 | send_sig(SIGKILL, current, 0); |
| 948 | goto out_free_dentry; | 948 | goto out; |
| 949 | } | 949 | } |
| 950 | #endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */ | 950 | #endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */ |
| 951 | 951 | ||