diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
commit | d9ecdb282c91952796b7542c4f57fd6de6948d7b (patch) | |
tree | fd4de7923968afa7d2981fb037e2255fc2cfa1e1 /fs/binfmt_elf.c | |
parent | 4ef584ba84125b67c17b5aded38e7783cd8cdef0 (diff) | |
parent | 1d1f8b377c48e5aeddaea52eba74cc0539f088cd (diff) |
Merge branch 'for_rmk_13' of git://git.mnementh.co.uk/linux-2.6-im
Diffstat (limited to 'fs/binfmt_elf.c')
-rw-r--r-- | fs/binfmt_elf.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 3b6ff854d983..655ed8d30a86 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c | |||
@@ -1003,12 +1003,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) | |||
1003 | #endif | 1003 | #endif |
1004 | 1004 | ||
1005 | start_thread(regs, elf_entry, bprm->p); | 1005 | start_thread(regs, elf_entry, bprm->p); |
1006 | if (unlikely(current->ptrace & PT_PTRACED)) { | ||
1007 | if (current->ptrace & PT_TRACE_EXEC) | ||
1008 | ptrace_notify ((PTRACE_EVENT_EXEC << 8) | SIGTRAP); | ||
1009 | else | ||
1010 | send_sig(SIGTRAP, current, 0); | ||
1011 | } | ||
1012 | retval = 0; | 1006 | retval = 0; |
1013 | out: | 1007 | out: |
1014 | kfree(loc); | 1008 | kfree(loc); |