Merge branch 'master' into next

2008-08-28 10:47:34 +10:00
parent 93c06cbbf9 4c246edd25
commit 86d688984d
4405 changed files with 100578 additions and 38118 deletions
@@ -127,10 +127,14 @@ int register_security(struct security_operations *ops)

 /* Security operations */

-int security_ptrace(struct task_struct *parent, struct task_struct *child,
-		    unsigned int mode)
+int security_ptrace_may_access(struct task_struct *child, unsigned int mode)
 {
-	return security_ops->ptrace(parent, child, mode);
+	return security_ops->ptrace_may_access(child, mode);
+}
+
+int security_ptrace_traceme(struct task_struct *parent)
+{
+	return security_ops->ptrace_traceme(parent);
 }

 int security_capget(struct task_struct *target,