Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[sfrench/cifs-2.6.git] / kernel / ptrace.c

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index d95a72c9279dc2e1110d31c0dadacc39b30b198f..86a7f6c60cb2f2b4652ce671d6cf15268e11e8f8 100644 (file)
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -35,9 +35,9 @@ void __ptrace_link(task_t *child, task_t *new_parent)
        if (child->parent == new_parent)
                return;
        list_add(&child->ptrace_list, &child->parent->ptrace_children);
-       REMOVE_LINKS(child);
+       remove_parent(child);
        child->parent = new_parent;
-       SET_LINKS(child);
+       add_parent(child);
 }
  
 /*
@@ -77,9 +77,9 @@ void __ptrace_unlink(task_t *child)
        child->ptrace = 0;
        if (!list_empty(&child->ptrace_list)) {
                list_del_init(&child->ptrace_list);
-               REMOVE_LINKS(child);
+               remove_parent(child);
                child->parent = child->real_parent;
-               SET_LINKS(child);
+               add_parent(child);
        }
 
        ptrace_untrace(child);