diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /kernel/ptrace.c | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'kernel/ptrace.c')
| -rw-r--r-- | kernel/ptrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 5b8dd98a230e..b88d4186cd7a 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c | |||
| @@ -155,7 +155,7 @@ int ptrace_attach(struct task_struct *task) | |||
| 155 | retval = -EPERM; | 155 | retval = -EPERM; |
| 156 | if (task->pid <= 1) | 156 | if (task->pid <= 1) |
| 157 | goto bad; | 157 | goto bad; |
| 158 | if (task == current) | 158 | if (task->tgid == current->tgid) |
| 159 | goto bad; | 159 | goto bad; |
| 160 | /* the same process cannot be attached many times */ | 160 | /* the same process cannot be attached many times */ |
| 161 | if (task->ptrace & PT_PTRACED) | 161 | if (task->ptrace & PT_PTRACED) |