diff options
| author | Chuck Ebbert <cebbert@redhat.com> | 2011-03-05 21:51:32 -0500 |
|---|---|---|
| committer | Chuck Ebbert <cebbert@redhat.com> | 2011-03-05 21:51:32 -0500 |
| commit | 3d285d429053ee1e0e9f1a3333b4116e047ea2a4 (patch) | |
| tree | 50607aa79f4f576bd55741e2d374782b800033f0 /linux-2.6-utrace-revert-make-ptrace-functions-static.patch | |
| parent | 3c4ea9ad7f15a2dce27521c4bc5ae66464691039 (diff) | |
| download | kernel-3d285d429053ee1e0e9f1a3333b4116e047ea2a4.tar.gz kernel-3d285d429053ee1e0e9f1a3333b4116e047ea2a4.tar.xz kernel-3d285d429053ee1e0e9f1a3333b4116e047ea2a4.zip | |
Linux 2.6.38-rc7-git4
Revert upstream commit e3e89cc535223433a619d0969db3fa05cdd946b8
for now to fix utrace build.
Diffstat (limited to 'linux-2.6-utrace-revert-make-ptrace-functions-static.patch')
| -rw-r--r-- | linux-2.6-utrace-revert-make-ptrace-functions-static.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/linux-2.6-utrace-revert-make-ptrace-functions-static.patch b/linux-2.6-utrace-revert-make-ptrace-functions-static.patch new file mode 100644 index 000000000..5e3dcc21d --- /dev/null +++ b/linux-2.6-utrace-revert-make-ptrace-functions-static.patch @@ -0,0 +1,47 @@ +Revert: +commit e3e89cc535223433a619d0969db3fa05cdd946b8 +("Mark ptrace_{traceme,attach,detach} static") + +--- b/include/linux/ptrace.h ++++ a/include/linux/ptrace.h +@@ -102,8 +102,11 @@ + + extern long arch_ptrace(struct task_struct *child, long request, + unsigned long addr, unsigned long data); ++extern int ptrace_traceme(void); + extern int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len); + extern int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long dst, int len); ++extern int ptrace_attach(struct task_struct *tsk); ++extern int ptrace_detach(struct task_struct *, unsigned int); + extern void ptrace_disable(struct task_struct *); + extern int ptrace_check_attach(struct task_struct *task, int kill); + extern int ptrace_request(struct task_struct *child, long request, +--- b/kernel/ptrace.c ++++ a/kernel/ptrace.c +@@ -163,7 +163,7 @@ + return !err; + } + ++int ptrace_attach(struct task_struct *task) +-static int ptrace_attach(struct task_struct *task) + { + int retval; + +@@ -219,7 +219,7 @@ + * Performs checks and sets PT_PTRACED. + * Should be used by all ptrace implementations for PTRACE_TRACEME. + */ ++int ptrace_traceme(void) +-static int ptrace_traceme(void) + { + int ret = -EPERM; + +@@ -293,7 +293,7 @@ + return false; + } + ++int ptrace_detach(struct task_struct *child, unsigned int data) +-static int ptrace_detach(struct task_struct *child, unsigned int data) + { + bool dead = false; + |