rpms/kernel/devel kernel.spec, 1.901, 1.902 linux-2.6-utrace.patch, 1.93, 1.94

[Roland McGrath]

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11557

Modified Files:
	kernel.spec linux-2.6-utrace.patch 
Log Message:
utrace update


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.901
retrieving revision 1.902
diff -u -r1.901 -r1.902
--- kernel.spec	26 Aug 2008 01:38:04 -0000	1.901
+++ kernel.spec	26 Aug 2008 01:55:23 -0000	1.902
@@ -1739,6 +1739,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Aug 25 2008 Roland McGrath <roland at redhat.com>
+- utrace update
+
 * Mon Aug 25 2008 Dave Jones <davej at redhat.com>
 - Merge Linux-2.6 up to commit b8e6c91c74e9f0279b7c51048779b3d62da60b88
 

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- linux-2.6-utrace.patch	23 Aug 2008 10:08:15 -0000	1.93
+++ linux-2.6-utrace.patch	26 Aug 2008 01:55:23 -0000	1.94
@@ -9,8 +9,8 @@
  kernel/Makefile                   |    1 +
  kernel/ptrace.c                   |  604 +++++++++-
  kernel/signal.c                   |   14 +-
- kernel/utrace.c                   | 2522 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 4534 insertions(+), 8 deletions(-)
+ kernel/utrace.c                   | 2511 +++++++++++++++++++++++++++++++++++++
+ 12 files changed, 4523 insertions(+), 8 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
 index 1615350..92ca631 100644  
@@ -682,7 +682,7 @@
  extern void force_sig_specific(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 b48d819..f9f4956 100644  
+index b48d819..717a1c8 100644  
 --- a/include/linux/tracehook.h
 +++ b/include/linux/tracehook.h
 @@ -49,6 +49,7 @@
@@ -707,8 +707,8 @@
  	struct pt_regs *regs)
  {
 +	if ((task_utrace_flags(current) & UTRACE_EVENT(SYSCALL_ENTRY)) &&
-+	     utrace_report_syscall_entry(regs))
-+	    return 1;
++	    utrace_report_syscall_entry(regs))
++		return 1;
  	ptrace_report_syscall(regs);
  	return 0;
  }
@@ -2434,10 +2434,10 @@
  			  struct pt_regs *regs, void *cookie)
 diff --git a/kernel/utrace.c b/kernel/utrace.c
 new file mode 100644
-index ...b4ca09e 100644  
+index ...aad2181 100644  
 --- /dev/null
 +++ b/kernel/utrace.c
-@@ -0,0 +1,2522 @@
+@@ -0,0 +1,2511 @@
 +/*
 + * utrace infrastructure interface for debugging user processes
 + *
@@ -2901,17 +2901,6 @@
 +#define LIVE_FLAGS_MASK	(~0UL)
 +
 +/*
-+ * Return true if there is a SIGKILL that should be waking us up.
-+ * Called with the siglock held.
-+ */
-+static inline bool sigkill_pending(struct task_struct *tsk)
-+{
-+	return ((sigismember(&tsk->pending.signal, SIGKILL) ||
-+		 sigismember(&tsk->signal->shared_pending.signal, SIGKILL)) &&
-+		likely(!sigismember(&tsk->blocked, SIGKILL)));
-+}
-+
-+/*
 + * Perform %UTRACE_STOP, i.e. block in TASK_TRACED until woken up.
 + * @task == current, @utrace == current->utrace, which is not locked.
 + * Return true if we were woken up by SIGKILL even though some utrace
@@ -2933,7 +2922,7 @@
 +	spin_lock(&utrace->lock);
 +	spin_lock_irq(&task->sighand->siglock);
 +
-+	if (unlikely(sigkill_pending(task))) {
++	if (unlikely(sigismember(&task->pending.signal, SIGKILL))) {
 +		spin_unlock(&utrace->lock);
 +		spin_unlock_irq(&task->sighand->siglock);
 +		return true;