Merge branch 'for-linus' of git://neil.brown.name/md

[linux-2.6] / include / linux / ptrace.h

diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index ed69c03692d9fb49ca8b201a262a6c3996003e11..ea7416c901d1ef8923adb2417b236cf8633a09f0 100644 (file)
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -172,7 +172,7 @@ static inline void ptrace_init_task(struct task_struct *child, bool ptrace)
        child->ptrace = 0;
        if (unlikely(ptrace)) {
                child->ptrace = current->ptrace;
-               __ptrace_link(child, current->parent);
+               ptrace_link(child, current->parent);
        }
 }
 
@@ -314,6 +314,10 @@ static inline void user_enable_block_step(struct task_struct *task)
 #define arch_ptrace_stop(code, info)           do { } while (0)
 #endif
 
+extern int task_current_syscall(struct task_struct *target, long *callno,
+                               unsigned long args[6], unsigned int maxargs,
+                               unsigned long *sp, unsigned long *pc);
+
 #endif
 
 #endif