rpms/kernel/devel linux-2.6-utrace-zzz-fixup.patch, NONE, 1.1 kernel.spec, 1.355, 1.356

[Chuck Ebbert (cebbert)]

Author: cebbert

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-utrace-zzz-fixup.patch 
Log Message:
* Thu Jan 10 2008 Chuck Ebbert <cebbert at redhat.com>
- temporarily fix up utrace breakage


linux-2.6-utrace-zzz-fixup.patch:

--- NEW FILE linux-2.6-utrace-zzz-fixup.patch ---
Apply with -R to revert some rc7-git2 changes for utrace.

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index ba8de7c..f0b3171 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1384,7 +1384,7 @@ static void fill_prstatus(struct elf_prstatus *prstatus,
 	prstatus->pr_sigpend = p->pending.signal.sig[0];
 	prstatus->pr_sighold = p->blocked.sig[0];
 	prstatus->pr_pid = task_pid_vnr(p);
-	prstatus->pr_ppid = task_pid_vnr(p->parent);
+	prstatus->pr_ppid = task_pid_vnr(p->real_parent);
 	prstatus->pr_pgrp = task_pgrp_vnr(p);
 	prstatus->pr_sid = task_session_vnr(p);
 	if (thread_group_leader(p)) {
@@ -1430,7 +1430,7 @@ static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p,
 	psinfo->pr_psargs[len] = 0;
 
 	psinfo->pr_pid = task_pid_vnr(p);
-	psinfo->pr_ppid = task_pid_vnr(p->parent);
+	psinfo->pr_ppid = task_pid_vnr(p->real_parent);
 	psinfo->pr_pgrp = task_pgrp_vnr(p);
 	psinfo->pr_sid = task_session_vnr(p);
 
diff --git a/kernel/acct.c b/kernel/acct.c
index cf19547..521dfa5 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -482,7 +482,7 @@ static void do_acct_process(struct file *file)
 #endif
 #if ACCT_VERSION==3
 	ac.ac_pid = current->tgid;
-	ac.ac_ppid = current->parent->tgid;
+	ac.ac_ppid = current->real_parent->tgid;
 #endif
 
 	spin_lock_irq(&current->sighand->siglock);
diff --git a/kernel/sched.c b/kernel/sched.c
index 3df84ea..37cf07a 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4918,7 +4918,7 @@ static void show_task(struct task_struct *p)
 	}
 #endif
 	printk(KERN_CONT "%5lu %5d %6d\n", free,
-		task_pid_nr(p), task_pid_nr(p->parent));
+		task_pid_nr(p), task_pid_nr(p->real_parent));
 
 	if (state != TASK_RUNNING)
 		show_stack(p, NULL);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- kernel.spec	10 Jan 2008 22:07:32 -0000	1.355
+++ kernel.spec	10 Jan 2008 23:10:46 -0000	1.356
@@ -567,6 +567,7 @@
 Patch35: linux-2.6-utrace-ptrace-compat-sparc64.patch
 Patch36: linux-2.6-utrace-ptrace-compat-s390.patch
 Patch37: linux-2.6-utrace-ptrace-compat-avr32.patch
+Patch38: linux-2.6-utrace-zzz-fixup.patch
 
 Patch41: linux-2.6-sysrq-c.patch
 Patch42: linux-2.6-x86-tune-generic.patch
@@ -997,6 +998,8 @@
 ApplyPatch linux-2.6-utrace-ptrace-compat-sparc64.patch
 ApplyPatch linux-2.6-utrace-ptrace-compat-s390.patch
 ApplyPatch linux-2.6-utrace-ptrace-compat-avr32.patch
+# temporarily fix up breakage caused by rc7-git2
+ApplyPatch linux-2.6-utrace-zzz-fixup.patch -R
 
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
@@ -1747,6 +1750,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Thu Jan 10 2008 Chuck Ebbert <cebbert at redhat.com>
+- temporarily fix up utrace breakage
+
 * Thu Jan 10 2008 John W. Linville <linville at redhat.com>
 - rt2500usb thinko fix
 - b43 N phy pre-support updates