rpms/kernel/devel kernel.spec, 1.513, 1.514 linux-2.6-utrace.patch, 1.68, 1.69

[Roland McGrath (roland)]

Author: roland

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

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


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -r1.513 -r1.514
--- kernel.spec	19 Mar 2008 20:39:44 -0000	1.513
+++ kernel.spec	19 Mar 2008 20:57:06 -0000	1.514
@@ -1724,13 +1724,13 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Wed Mar 19 2008 Roland McGrath <roland at redhat.com>
+- utrace is back, rebased
+
 * Wed Mar 19 2008 Dave Jones <davej at redhat.com>
 - Add kernel posttrans and preun hooks for other packages (#433121)
   Bump mkinitrd requires accordingly.
 
-* Wed Mar 19 2008 Roland McGrath <roland at redhat.com>
-- utrace is back, rebased
-
 * Wed Mar 19 2008 Dave Jones <davej at redhat.com>
 - 2.6.25-rc6-git3
 

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.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- linux-2.6-utrace.patch	19 Mar 2008 20:03:50 -0000	1.68
+++ linux-2.6-utrace.patch	19 Mar 2008 20:57:06 -0000	1.69
@@ -638,6 +638,35 @@
  	return 0;
  out:
  	return retval;
+diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
+index 4b749c4..e932b43 100644  
+--- a/arch/powerpc/kernel/asm-offsets.c
++++ b/arch/powerpc/kernel/asm-offsets.c
+@@ -26,8 +26,6 @@
+ #ifdef CONFIG_PPC64
+ #include <linux/time.h>
+ #include <linux/hardirq.h>
+-#else
+-#include <linux/ptrace.h>
+ #endif
+ 
+ #include <asm/io.h>
+@@ -60,7 +58,6 @@ int main(void)
+ 	DEFINE(AUDITCONTEXT, offsetof(struct task_struct, audit_context));
+ #else
+ 	DEFINE(THREAD_INFO, offsetof(struct task_struct, stack));
+-	DEFINE(PTRACE, offsetof(struct task_struct, ptrace));
+ #endif /* CONFIG_PPC64 */
+ 
+ 	DEFINE(KSP, offsetof(struct thread_struct, ksp));
+@@ -80,7 +77,6 @@ int main(void)
+ 	DEFINE(PGDIR, offsetof(struct thread_struct, pgdir));
+ #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
+ 	DEFINE(THREAD_DBCR0, offsetof(struct thread_struct, dbcr0));
+-	DEFINE(PT_PTRACED, PT_PTRACED);
+ #endif
+ #ifdef CONFIG_SPE
+ 	DEFINE(THREAD_EVR0, offsetof(struct thread_struct, evr[0]));
 diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
 index 4846bf5..7c8e3da 100644  
 --- a/arch/powerpc/kernel/process.c