rpms/kernel/devel linux-2.6-utrace.patch, 1.70, 1.71 kernel.spec, 1.522, 1.523

[Roland McGrath (roland)]

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26136

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

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.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- linux-2.6-utrace.patch	20 Mar 2008 22:01:37 -0000	1.70
+++ linux-2.6-utrace.patch	22 Mar 2008 04:11:40 -0000	1.71
@@ -1659,7 +1659,7 @@
  		"State:\t%s\n"
  		"Tgid:\t%d\n"
 diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 8a10f6f..ff8f7fb 100644  
+index 81d7d14..30d9cd3 100644  
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
 @@ -68,6 +68,7 @@
@@ -1982,10 +1982,10 @@
  
  /*
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 3625fca..bafe995 100644  
+index fed07d0..8681933 100644  
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -995,7 +995,6 @@ struct task_struct {
+@@ -996,7 +996,6 @@ struct task_struct {
  	void *stack;
  	atomic_t usage;
  	unsigned int flags;	/* per process flags, defined below */
@@ -1993,7 +1993,7 @@
  
  	int lock_depth;		/* BKL lock depth */
  
-@@ -1042,12 +1041,6 @@ struct task_struct {
+@@ -1043,12 +1042,6 @@ struct task_struct {
  #endif
  
  	struct list_head tasks;
@@ -2006,7 +2006,7 @@
  
  	struct mm_struct *mm, *active_mm;
  
-@@ -1072,7 +1065,6 @@ struct task_struct {
+@@ -1073,7 +1066,6 @@ struct task_struct {
  	 * p->parent->pid)
  	 */
  	struct task_struct *real_parent; /* real parent process (when being debugged) */
@@ -2014,7 +2014,7 @@
  	/*
  	 * children/sibling forms the list of my children plus the
  	 * tasks I'm ptracing.
-@@ -1161,6 +1153,11 @@ struct task_struct {
+@@ -1162,6 +1154,11 @@ struct task_struct {
  #endif
  	seccomp_t seccomp;
  
@@ -2026,7 +2026,7 @@
  /* Thread group tracking */
     	u32 parent_exec_id;
     	u32 self_exec_id;
-@@ -1217,8 +1214,6 @@ struct task_struct {
+@@ -1218,8 +1215,6 @@ struct task_struct {
  
  	struct io_context *io_context;
  
@@ -2035,7 +2035,7 @@
  #ifdef CONFIG_TASK_XACCT
  /* i/o counters(bytes read/written, #syscalls */
  	u64 rchar, wchar, syscr, syscw;
-@@ -1255,6 +1250,10 @@ struct task_struct {
+@@ -1256,6 +1251,10 @@ struct task_struct {
  	atomic_t fs_excl;	/* holding fs exclusive resources */
  	struct rcu_head rcu;
  
@@ -2046,7 +2046,7 @@
  	/*
  	 * cache last used pipe for splice
  	 */
-@@ -1699,6 +1698,7 @@ extern int kill_pgrp(struct pid *pid, in
+@@ -1700,6 +1699,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 void do_notify_parent(struct task_struct *, int);
@@ -2054,7 +2054,7 @@
  extern void force_sig(int, struct task_struct *);
  extern void force_sig_specific(int, struct task_struct *);
  extern int send_sig(int, struct task_struct *, int);
-@@ -1788,7 +1788,7 @@ extern void wait_task_inactive(struct ta
+@@ -1789,7 +1789,7 @@ extern void wait_task_inactive(struct ta
  #endif
  
  #define remove_parent(p)	list_del_init(&(p)->sibling)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -r1.522 -r1.523
--- kernel.spec	22 Mar 2008 03:32:29 -0000	1.522
+++ kernel.spec	22 Mar 2008 04:11:40 -0000	1.523
@@ -963,7 +963,7 @@
 
 # Roland's utrace ptrace replacement.
 # Main patch includes i386, x86_64, powerpc.
-#ApplyPatch linux-2.6-utrace.patch
+ApplyPatch linux-2.6-utrace.patch
 
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
@@ -1722,6 +1722,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Fri Mar 21 2008 Roland McGrath <roland at redhat.com>
+- reenable utrace
+
 * Fri Mar 21 2008 Jarod Wilson <jwilson at redhat.com>
 - firewire: make sure phy config packets get sent before initiating bus
   reset. Fixes bugzilla.kernel.org #10128.