diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 23:10:34 +0200 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 23:10:34 +0200 |
commit | 12df7556705aae97f24a397377e17898700d7192 (patch) | |
tree | 5adc6b1c2aa940263ee2e88fc6645918533da539 /kernel/ptrace.c | |
parent | powerpc/ppc: export strncasecmp (diff) | |
parent | Linux v2.6.17-rc1 (diff) | |
download | linux-12df7556705aae97f24a397377e17898700d7192.tar.xz linux-12df7556705aae97f24a397377e17898700d7192.zip |
Merge branch 'master'
Diffstat (limited to 'kernel/ptrace.c')
-rw-r--r-- | kernel/ptrace.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 86a7f6c60cb2..0eeb7e66722c 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -30,8 +30,7 @@ */ void __ptrace_link(task_t *child, task_t *new_parent) { - if (!list_empty(&child->ptrace_list)) - BUG(); + BUG_ON(!list_empty(&child->ptrace_list)); if (child->parent == new_parent) return; list_add(&child->ptrace_list, &child->parent->ptrace_children); |