---

yaml --- r: 329083 b: refs/heads/master c: 9f99798 h: refs/heads/master i: 329081: 7d0df61 329079: 3e66d29 v: v3
git-mirror · Aug 3, 2012 · a8c8368 · a8c8368
1 parent 6ba93d9
commit a8c8368
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de4bb3b9c788ea5504dfe094e34d831e8395075d
+refs/heads/master: 9f99798ff49e73dded73a8c674044ea6fb6af651
diff --git a/trunk/include/linux/ptrace.h b/trunk/include/linux/ptrace.h
@@ -130,8 +130,6 @@ extern void exit_ptrace(struct task_struct *tracer);
 #define PTRACE_MODE_READ	0x01
 #define PTRACE_MODE_ATTACH	0x02
 #define PTRACE_MODE_NOAUDIT	0x04
-/* Returns 0 on success, -errno on denial. */
-extern int __ptrace_may_access(struct task_struct *task, unsigned int mode);
 /* Returns true on success, false on denial. */
 extern bool ptrace_may_access(struct task_struct *task, unsigned int mode);
 

diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c
@@ -180,7 +180,8 @@ static int ptrace_has_cap(struct user_namespace *ns, unsigned int mode)
 		return has_ns_capability(current, ns, CAP_SYS_PTRACE);
 }
 
-int __ptrace_may_access(struct task_struct *task, unsigned int mode)
+/* Returns 0 on success, -errno on denial. */
+static int __ptrace_may_access(struct task_struct *task, unsigned int mode)
 {
 	const struct cred *cred = current_cred(), *tcred;