rpms/kernel
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

utrace update

Browse source 
Conflicts:

	kernel.spec
This commit is contained in:
Kyle McMartin 2011-01-22 13:43:13 -05:00
commit 71f70cd13e
5 changed files with 151 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

18
linux-2.6-tracehook.patch
View file

@ -20,10 +20,10 @@ Signed-off-by: Roland McGrath <roland@redhat.com>
5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 4272521..a85fb41 100644
index 092a04f..619cdf0 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -105,6 +105,7 @@ extern int ptrace_traceme(void);
@@ -106,6 +106,7 @@ 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);
@ -32,10 +32,10 @@ index 4272521..a85fb41 100644
extern void ptrace_disable(struct task_struct *);
extern int ptrace_check_attach(struct task_struct *task, int kill);
diff --git a/include/linux/sched.h b/include/linux/sched.h
index ce160d6..5e7cc95 100644
index 2238745..09f26df 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2030,6 +2030,7 @@ extern int kill_pgrp(struct pid *pid, in
@@ -2061,6 +2061,7 @@ extern int kill_pgrp(struct pid *pid, in
extern int kill_pid(struct pid *pid, int sig, int priv);
extern int kill_proc_info(int, struct siginfo *, pid_t);
extern int do_notify_parent(struct task_struct *, int);
@ -44,7 +44,7 @@ index ce160d6..5e7cc95 100644
extern void force_sig(int, struct task_struct *);
extern int send_sig(int, struct task_struct *, int);
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
index 10db010..c78b2f4 100644
index 3a2e66d..98917e9 100644
--- a/include/linux/tracehook.h
+++ b/include/linux/tracehook.h
@@ -134,7 +134,7 @@ static inline __must_check int tracehook
@ -93,7 +93,7 @@ index 10db010..c78b2f4 100644
/**
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index f34d798..8049cb5 100644
index 99bbaa3..84d9f8f 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -270,7 +270,7 @@ static int ignoring_children(struct sigh
@ -106,10 +106,10 @@ index f34d798..8049cb5 100644
__ptrace_unlink(p);
diff --git a/kernel/signal.c b/kernel/signal.c
index bded651..6d13d9f 100644
index 4e3cff1..b74324d 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1521,7 +1521,7 @@ int do_notify_parent(struct task_struct
@@ -1522,7 +1522,7 @@ int do_notify_parent(struct task_struct
return ret;
}
@ -118,7 +118,7 @@ index bded651..6d13d9f 100644
{
struct siginfo info;
unsigned long flags;
@@ -1791,7 +1791,7 @@ static int do_signal_stop(int signr)
@@ -1794,7 +1794,7 @@ static int do_signal_stop(int signr)
static int ptrace_signal(int signr, siginfo_t *info,
struct pt_regs *regs, void *cookie)
{