rpms/kernel/devel TODO, 1.45, 1.46 kernel.spec, 1.1129, 1.1130 linux-2.6-utrace.patch, 1.102, 1.103 linux-2.6-x86-tracehook.patch, 1.9, NONE linux-2.6.27-x86-tracehook-syscall-arg-order.patch, 1.1, NONE

[Roland McGrath]

Author: roland

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

Modified Files:
	TODO kernel.spec linux-2.6-utrace.patch 
Removed Files:
	linux-2.6-x86-tracehook.patch 
	linux-2.6.27-x86-tracehook-syscall-arg-order.patch 
Log Message:
* Fri Nov 14 2008 Roland McGrath <roland at redhat.com>
- x86 tracehook merged upstream
- utrace update (merge conflict only)



Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/TODO,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- TODO	14 Nov 2008 21:41:32 -0000	1.45
+++ TODO	14 Nov 2008 21:50:55 -0000	1.46
@@ -64,11 +64,6 @@
 linux-2.6-debug-sizeof-structs.patch
 	Fedora local debug stuff.
 
-linux-2.6-x86-tracehook.patch
-linux-2.6.27-x86-tracehook-syscall-arg-order.patch
-	(utrace prerequisite)
-	merged in v2.6.28-rc1
-
 linux-2.6-utrace.patch
 	utrace
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1129
retrieving revision 1.1130
diff -u -r1.1129 -r1.1130
--- kernel.spec	14 Nov 2008 21:41:32 -0000	1.1129
+++ kernel.spec	14 Nov 2008 21:50:55 -0000	1.1130
@@ -583,8 +583,6 @@
 Patch20: linux-2.6-hotfixes.patch
 
 Patch21: linux-2.6-utrace.patch
-Patch22: linux-2.6-x86-tracehook.patch
-Patch23: linux-2.6.27-x86-tracehook-syscall-arg-order.patch
 
 Patch30: linux-2.6-x86-mtrr-kill-bogus-warning.patch
 
@@ -1099,9 +1097,7 @@
 ApplyPatch linux-2.6-hotfixes.patch
 
 # Roland's utrace ptrace replacement.
-#ApplyPatch linux-2.6-utrace.patch
-#ApplyPatch linux-2.6-x86-tracehook.patch
-#ApplyPatch linux-2.6.27-x86-tracehook-syscall-arg-order.patch
+ApplyPatch linux-2.6-utrace.patch
 
 ApplyPatch linux-2.6-x86-mtrr-kill-bogus-warning.patch
 
@@ -1933,6 +1929,10 @@
 
 %changelog
 * Fri Nov 14 2008 Roland McGrath <roland at redhat.com>
+- x86 tracehook merged upstream
+- utrace update (merge conflict only)
+
+* Fri Nov 14 2008 Roland McGrath <roland at redhat.com>
 - CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y replaces patch.
 
 * Thu Nov 13 2008 Dave Jones <davej at redhat.com>

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.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- linux-2.6-utrace.patch	15 Oct 2008 05:15:44 -0000	1.102
+++ linux-2.6-utrace.patch	14 Nov 2008 21:50:55 -0000	1.103
@@ -1,4 +1,4 @@
- Documentation/DocBook/Makefile    |    2 +-
+ Documentation/DocBook/Makefile    |    4 +-
  Documentation/DocBook/utrace.tmpl |  566 ++++++++
  fs/proc/array.c                   |    3 +
  include/linux/ptrace.h            |   21 +
@@ -10,21 +10,25 @@
  kernel/ptrace.c                   |  612 +++++++++-
  kernel/signal.c                   |   14 +-
  kernel/utrace.c                   | 2586 +++++++++++++++++++++++++++++++++++++
- 12 files changed, 4604 insertions(+), 8 deletions(-)
+ 12 files changed, 4605 insertions(+), 9 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
-index 1615350..92ca631 100644  
+index 9b1f6ca..e39334b 100644  
 --- a/Documentation/DocBook/Makefile
 +++ b/Documentation/DocBook/Makefile
-@@ -7,7 +7,7 @@
+@@ -6,10 +6,10 @@
+ # To add a new book the only step required is to add the book to the
  # list of DOCBOOKS.
  
- DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
--	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
-+	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml utrace.xml \
+-DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml \
++DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
+ 	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
  	    procfs-guide.xml writing_usb_driver.xml networking.xml \
- 	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
+-	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
++	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml utrace.xml \
  	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
+ 	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
+ 	    mac80211.xml debugobjects.xml sh.xml
 diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl
 new file mode 100644
 index ...1c37104 100644  
@@ -598,7 +602,7 @@
 +
 +</book>
 diff --git a/fs/proc/array.c b/fs/proc/array.c
-index f4bc0e7..469903f 100644  
+index 6af7fba..9b6902a 100644  
 --- a/fs/proc/array.c
 +++ b/fs/proc/array.c
 @@ -81,6 +81,7 @@
@@ -619,10 +623,10 @@
  	if (p->files)
  		fdt = files_fdtable(p->files);
 diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
-index ea7416c..06eaace 100644  
+index 22641d5..91b3412 100644  
 --- a/include/linux/ptrace.h
 +++ b/include/linux/ptrace.h
-@@ -121,6 +121,7 @@ static inline void ptrace_unlink(struct 
+@@ -120,6 +120,7 @@ static inline void ptrace_unlink(struct 
  int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data);
  int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data);
  
@@ -630,7 +634,7 @@
  /**
   * task_ptrace - return %PT_* flags that apply to a task
   * @task:	pointer to &task_struct in question
-@@ -154,6 +155,26 @@ static inline int ptrace_event(int mask,
+@@ -153,6 +154,26 @@ static inline int ptrace_event(int mask,
  	return 1;
  }
  
@@ -658,10 +662,10 @@
   * ptrace_init_task - initialize ptrace state for a new child
   * @child:		new child task
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index c226c7b..97e3606 100644  
+index 644ffbd..97f772d 100644  
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -1199,6 +1199,11 @@ struct task_struct {
+@@ -1239,6 +1239,11 @@ struct task_struct {
  #endif
  	seccomp_t seccomp;
  
@@ -673,7 +677,7 @@
  /* Thread group tracking */
     	u32 parent_exec_id;
     	u32 self_exec_id;
-@@ -1775,6 +1780,7 @@ extern int kill_pgrp(struct pid *pid, in
+@@ -1825,6 +1830,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);
@@ -1628,10 +1632,10 @@
 +
 +#endif	/* linux/utrace.h */
 diff --git a/init/Kconfig b/init/Kconfig
-index 8a8e2d0..e52678f 100644  
+index 86b00c5..f84117e 100644  
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -888,6 +888,32 @@ config STOP_MACHINE
+@@ -923,6 +923,32 @@ config STOP_MACHINE
  	help
  	  Need stop_machine() primitive.
  
@@ -1665,10 +1669,10 @@
  
  config PREEMPT_NOTIFIERS
 diff --git a/kernel/Makefile b/kernel/Makefile
-index 4e1d7df..eca21ef 100644  
+index 9a3ec66..1f14166 100644  
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
-@@ -64,6 +64,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
+@@ -66,6 +66,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
  obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o
  obj-$(CONFIG_STOP_MACHINE) += stop_machine.o
  obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
@@ -1677,7 +1681,7 @@
  obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
  obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 356699a..29c60d1 100644  
+index 1e68e4c..516520a 100644  
 --- a/kernel/ptrace.c
 +++ b/kernel/ptrace.c
 @@ -16,6 +16,7 @@
@@ -1696,7 +1700,7 @@
  /*
   * Turn a tracing stop into a normal stop now, since with no tracer there
   * would be no way to wake it up with SIGCONT or SIGKILL.  If there was a
-@@ -58,6 +60,55 @@ void ptrace_untrace(struct task_struct *
+@@ -58,6 +60,55 @@ static void ptrace_untrace(struct task_s
  	spin_unlock(&child->sighand->siglock);
  }
  
@@ -2393,10 +2397,10 @@
  }
  
 diff --git a/kernel/signal.c b/kernel/signal.c
-index e661b01..1effefc 100644  
+index 4530fc6..0e85826 100644  
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
-@@ -1415,7 +1415,7 @@ int do_notify_parent(struct task_struct 
+@@ -1419,7 +1419,7 @@ int do_notify_parent(struct task_struct 
  	return ret;
  }
  
@@ -2405,7 +2409,7 @@
  {
  	struct siginfo info;
  	unsigned long flags;
-@@ -1470,6 +1470,8 @@ static void do_notify_parent_cldstop(str
+@@ -1474,6 +1474,8 @@ static void do_notify_parent_cldstop(str
  	spin_unlock_irqrestore(&sighand->siglock, flags);
  }
  
@@ -2414,7 +2418,7 @@
  static inline int may_ptrace_stop(void)
  {
  	if (!likely(current->ptrace & PT_PTRACED))
-@@ -1602,6 +1604,8 @@ void ptrace_notify(int exit_code)
+@@ -1606,6 +1608,8 @@ void ptrace_notify(int exit_code)
  	spin_unlock_irq(&current->sighand->siglock);
  }
  
@@ -2423,7 +2427,7 @@
  static void
  finish_stop(int stop_count)
  {
-@@ -1679,6 +1683,7 @@ static int do_signal_stop(int signr)
+@@ -1683,6 +1687,7 @@ static int do_signal_stop(int signr)
  	return 1;
  }
  
@@ -2431,7 +2435,7 @@
  static int ptrace_signal(int signr, siginfo_t *info,
  			 struct pt_regs *regs, void *cookie)
  {
-@@ -1717,6 +1722,13 @@ static int ptrace_signal(int signr, sigi
+@@ -1721,6 +1726,13 @@ static int ptrace_signal(int signr, sigi
  
  	return signr;
  }


--- linux-2.6-x86-tracehook.patch DELETED ---


--- linux-2.6.27-x86-tracehook-syscall-arg-order.patch DELETED ---