Sun Dec 9 02:02:18 UTC 2007

Author: davej

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

Modified Files:
	.cvsignore kernel.spec linux-2.6-utrace-core.patch 
	linux-2.6-utrace-ptrace-compat-avr32.patch 
	linux-2.6-utrace-ptrace-compat.patch 
	linux-2.6-utrace-regset-avr32.patch 
	linux-2.6-utrace-tracehook-avr32.patch 
	linux-2.6-utrace-tracehook-s390.patch 
	linux-2.6-utrace-tracehook.patch sources upstream 
Added Files:
	patch-2.6.24-rc4-git6.bz2.sign 
Removed Files:
	patch-2.6.24-rc4-git5.bz2.sign 
Log Message:
* Sat Dec 08 2007 Dave Jones <davej at redhat.com>
- 2.6.24-rc4-git6

--- NEW FILE patch-2.6.24-rc4-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBHWkHkyGugalF9Dw4RAvqFAJ9ImXfnYguvWnXkLrUhBdxoEEztAQCeNqwS
042teuGBULdMxuX9bg7/S2g=
=Q0TR
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.731
retrieving revision 1.732
diff -u -r1.731 -r1.732
--- .cvsignore	7 Dec 2007 16:49:16 -0000	1.731
+++ .cvsignore	9 Dec 2007 02:01:29 -0000	1.732
@@ -4,4 +4,4 @@
 kernel-2.6.23
 linux-2.6.23.tar.bz2
 patch-2.6.24-rc4.bz2
-patch-2.6.24-rc4-git5.bz2
+patch-2.6.24-rc4-git6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- kernel.spec	7 Dec 2007 20:08:34 -0000	1.288
+++ kernel.spec	9 Dec 2007 02:01:29 -0000	1.289
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 4
 # The git snapshot level
-%define gitrev 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1740,6 +1740,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Sat Dec 08 2007 Dave Jones <davej at redhat.com>
+- 2.6.24-rc4-git6
+
 * Fri Dec 07 2007 Peter Jones <pjones at redhat.com>
 - Turn on CONFIG_FB_IMAC .
 

linux-2.6-utrace-core.patch:

Index: linux-2.6-utrace-core.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-core.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-utrace-core.patch	30 Nov 2007 14:55:05 -0000	1.11
+++ linux-2.6-utrace-core.patch	9 Dec 2007 02:01:29 -0000	1.12
@@ -3851,7 +3851,7 @@
 +#endif	/* linux/utrace.h */
 --- linux-2.6/include/linux/sched.h
 +++ linux-2.6/include/linux/sched.h
-@@ -1060,6 +1060,11 @@ struct task_struct {
+@@ -1064,6 +1064,11 @@ struct task_struct {
  	struct audit_context *audit_context;
  	seccomp_t seccomp;
  
@@ -3865,7 +3865,7 @@
     	u32 self_exec_id;
 --- linux-2.6/init/Kconfig
 +++ linux-2.6/init/Kconfig
-@@ -749,3 +749,21 @@ source "block/Kconfig"
+@@ -756,3 +756,21 @@ source "block/Kconfig"
  
  config PREEMPT_NOTIFIERS
  	bool

linux-2.6-utrace-ptrace-compat-avr32.patch:

Index: linux-2.6-utrace-ptrace-compat-avr32.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-ptrace-compat-avr32.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-utrace-ptrace-compat-avr32.patch	12 Nov 2007 08:19:34 -0000	1.4
+++ linux-2.6-utrace-ptrace-compat-avr32.patch	9 Dec 2007 02:01:29 -0000	1.5
@@ -12,12 +12,12 @@
 
 ---
 
- arch/avr32/kernel/ptrace.c |   93 +++++++++-----------------------------------
- 1 files changed, 18 insertions(+), 75 deletions(-)
+ arch/avr32/kernel/ptrace.c |   91 +++++++++-----------------------------------
+ 1 files changed, 19 insertions(+), 72 deletions(-)
 
 --- linux-2.6/arch/avr32/kernel/ptrace.c
 +++ linux-2.6/arch/avr32/kernel/ptrace.c
-@@ -79,101 +79,44 @@ const struct utrace_regset_view *utrace_
+@@ -112,98 +112,45 @@ const struct utrace_regset_view *utrace_
  }
  #endif /* CONFIG_UTRACE */
  
@@ -35,13 +35,12 @@
 +		unsigned long addr, unsigned long data, long *val)
  {
 -	int ret;
--
- 	pr_debug("arch_ptrace(%ld, %d, %#lx, %#lx)\n",
--		 request, child->pid, addr, data);
++	pr_debug("arch_ptrace(%ld, %d, %#lx, %#lx)\n",
 +		 *request, child->pid, addr, data);
  
  	pr_debug("ptrace: Enabling monitor mode...\n");
- 	__mtdr(DBGREG_DC, __mfdr(DBGREG_DC) | DC_MM | DC_DBE);
+ 	ocd_write(DC, ocd_read(DC) | (1 << OCD_DC_MM_BIT)
+ 			| (1 << OCD_DC_DBE_BIT));
  
 -	switch (request) {
 -	/* Read the word at location addr in the child process */
@@ -127,7 +126,6 @@
  		break;
  	}
  
--	pr_debug("sys_ptrace returning %d (DC = 0x%08lx)\n", ret, __mfdr(DBGREG_DC));
 -	return ret;
 +	return -ENOSYS;
  }

linux-2.6-utrace-ptrace-compat.patch:

Index: linux-2.6-utrace-ptrace-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-ptrace-compat.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-utrace-ptrace-compat.patch	16 Nov 2007 18:51:26 -0000	1.10
+++ linux-2.6-utrace-ptrace-compat.patch	9 Dec 2007 02:01:29 -0000	1.11
@@ -1322,7 +1322,7 @@
  	if (unlikely(in_atomic()))
  		printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n",
  				current->comm, task_pid_nr(current),
-@@ -1533,9 +1536,15 @@ check_continued:
+@@ -1531,9 +1534,15 @@ check_continued:
  				break;
  			}
  		}
@@ -3524,7 +3524,7 @@
  # According to Alan Modra <alan at linuxcare.com.au>, the -fno-omit-frame-pointer is
 --- linux-2.6/include/linux/sched.h
 +++ linux-2.6/include/linux/sched.h
-@@ -1157,6 +1157,10 @@ struct task_struct {
+@@ -1161,6 +1161,10 @@ struct task_struct {
  	atomic_t fs_excl;	/* holding fs exclusive resources */
  	struct rcu_head rcu;
  
@@ -3783,7 +3783,7 @@
  #endif
 --- linux-2.6/init/Kconfig
 +++ linux-2.6/init/Kconfig
-@@ -752,10 +752,21 @@ config PREEMPT_NOTIFIERS
+@@ -759,10 +759,21 @@ config PREEMPT_NOTIFIERS
  
  menu "Process debugging support"
  

linux-2.6-utrace-regset-avr32.patch:

Index: linux-2.6-utrace-regset-avr32.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-regset-avr32.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace-regset-avr32.patch	21 Aug 2007 19:42:55 -0000	1.3
+++ linux-2.6-utrace-regset-avr32.patch	9 Dec 2007 02:01:29 -0000	1.4
@@ -10,12 +10,12 @@
 
 ---
 
- arch/avr32/kernel/ptrace.c |  109 ++++++++++++++++++--------------------------
- 1 files changed, 44 insertions(+), 65 deletions(-)
+ arch/avr32/kernel/ptrace.c |  118 ++++++++++++++++----------------------------
+ 1 files changed, 44 insertions(+), 74 deletions(-)
 
 --- linux-2.6/arch/avr32/kernel/ptrace.c
 +++ linux-2.6/arch/avr32/kernel/ptrace.c
-@@ -14,94 +14,73 @@
+@@ -14,10 +14,14 @@
  #include <linux/ptrace.h>
  #include <linux/errno.h>
  #include <linux/user.h>
@@ -30,10 +30,10 @@
  static struct pt_regs *get_user_regs(struct task_struct *tsk)
  {
  	return (struct pt_regs *)((unsigned long)task_stack_page(tsk) +
- 				  THREAD_SIZE - sizeof(struct pt_regs));
+@@ -57,86 +61,59 @@ void ptrace_disable(struct task_struct *
+ 	clear_tsk_thread_flag(child, TIF_BREAKPOINT);
  }
  
--#if 0
 -/*
 - * Read the word at offset "offset" into the task's "struct user". We
 - * actually access the pt_regs struct stored on the kernel stack.
@@ -48,20 +48,20 @@
 -	unsigned long *regs;
 -	unsigned long value;
 -
--	pr_debug("ptrace_read_user(%p, %#lx, %p)\n",
--		 tsk, offset, data);
--
 -	if (offset & 3 || offset >= sizeof(struct user)) {
 -		printk("ptrace_read_user: invalid offset 0x%08lx\n", offset);
 -		return -EIO;
 -	}
-+	struct pt_regs *regs = get_user_regs(target);
- 
+-
 -	regs = (unsigned long *)get_user_regs(tsk);
 -
 -	value = 0;
 -	if (offset < sizeof(struct pt_regs))
 -		value = regs[offset / sizeof(regs[0])];
++	struct pt_regs *regs = get_user_regs(target);
+ 
+-	pr_debug("ptrace_read_user(%s[%u], %#lx, %p) -> %#lx\n",
+-		 tsk->comm, tsk->pid, offset, data, value);
 -
 -	return put_user(value, data);
 +	return utrace_regset_copyout(&pos, &count, &kbuf, &ubuf,
@@ -82,8 +82,11 @@
  {
 -	unsigned long *regs;
 -
+-	pr_debug("ptrace_write_user(%s[%u], %#lx, %#lx)\n",
+-			tsk->comm, tsk->pid, offset, value);
+-
 -	if (offset & 3 || offset >= sizeof(struct user)) {
--		printk("ptrace_write_user: invalid offset 0x%08lx\n", offset);
+-		pr_debug("  invalid offset 0x%08lx\n", offset);
 -		return -EIO;
 -	}
 -
@@ -154,3 +157,19 @@
  long arch_ptrace(struct task_struct *child, long request, long addr, long data)
  {
  	int ret;
+@@ -233,15 +210,8 @@ asmlinkage void syscall_trace(struct pt_
+ 	if (!test_thread_flag(TIF_SYSCALL_TRACE))
+ 		return;
+ 
+-<<<<<<< HEAD:arch/avr32/kernel/ptrace.c
+ 	tracehook_report_syscall(regs, is_exit);
+ }
+-=======
+-	/* The 0x80 provides a way for the tracing parent to
+-	 * distinguish between a syscall stop and SIGTRAP delivery */
+-	ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
+-				 ? 0x80 : 0));
+->>>>>>> 2c5ea0f2d8c7d4883dd0d8ec3c7e3f3640b4f814:arch/avr32/kernel/ptrace.c
+ 
+ /*
+  * Handle hitting a breakpoint

linux-2.6-utrace-tracehook-avr32.patch:

Index: linux-2.6-utrace-tracehook-avr32.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook-avr32.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace-tracehook-avr32.patch	12 Nov 2007 08:19:34 -0000	1.3
+++ linux-2.6-utrace-tracehook-avr32.patch	9 Dec 2007 02:01:29 -0000	1.4
@@ -9,11 +9,11 @@
 
 ---
 
- arch/avr32/kernel/ptrace.c       |  102 ++++++++++----------------------------
+ arch/avr32/kernel/ptrace.c       |   49 +++++++++++++++++-------------
  arch/avr32/kernel/process.c      |    2 -
- arch/avr32/kernel/entry-avr32b.S |   10 +++-
- include/asm-avr32/tracehook.h    |   62 +++++++++++++++++++++++
- 4 files changed, 96 insertions(+), 80 deletions(-)
+ arch/avr32/kernel/entry-avr32b.S |   10 +++++-
+ include/asm-avr32/tracehook.h    |   62 ++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 97 insertions(+), 26 deletions(-)
  create include/asm-avr32/tracehook.h
 
 --- linux-2.6/arch/avr32/kernel/ptrace.c
@@ -43,62 +43,16 @@
  #include <asm/mmu_context.h>
  #include <linux/kdebug.h>
  
-@@ -28,52 +24,7 @@ static struct pt_regs *get_user_regs(str
+@@ -28,6 +24,7 @@ static struct pt_regs *get_user_regs(str
  				  THREAD_SIZE - sizeof(struct pt_regs));
  }
  
--static void ptrace_single_step(struct task_struct *tsk)
--{
--	pr_debug("ptrace_single_step: pid=%u, SR=0x%08lx\n",
--		 tsk->pid, tsk->thread.cpu_context.sr);
--	if (!(tsk->thread.cpu_context.sr & SR_D)) {
--		/*
--		 * Set a breakpoint at the current pc to force the
--		 * process into debug mode.  The syscall/exception
--		 * exit code will set a breakpoint at the return
--		 * address when this flag is set.
--		 */
--		pr_debug("ptrace_single_step: Setting TIF_BREAKPOINT\n");
--		set_tsk_thread_flag(tsk, TIF_BREAKPOINT);
--	}
--
--	/* The monitor code will do the actual step for us */
--	set_tsk_thread_flag(tsk, TIF_SINGLE_STEP);
--}
--
--/*
-- * Called by kernel/ptrace.c when detaching
-- *
-- * Make sure any single step bits, etc. are not set
-- */
--void ptrace_disable(struct task_struct *child)
--{
--	clear_tsk_thread_flag(child, TIF_SINGLE_STEP);
--}
--
--/*
-- * Handle hitting a breakpoint
-- */
--static void ptrace_break(struct task_struct *tsk, struct pt_regs *regs)
--{
--	siginfo_t info;
--
--	info.si_signo = SIGTRAP;
--	info.si_errno = 0;
--	info.si_code  = TRAP_BRKPT;
--	info.si_addr  = (void __user *)instruction_pointer(regs);
--
--	pr_debug("ptrace_break: Sending SIGTRAP to PID %u (pc = 0x%p)\n",
--		 tsk->pid, info.si_addr);
--	force_sig_info(SIGTRAP, &info, tsk);
--}
--
 +#if 0
- /*
-  * Read the word at offset "offset" into the task's "struct user". We
-  * actually access the pt_regs struct stored on the kernel stack.
-@@ -243,32 +194,31 @@ long arch_ptrace(struct task_struct *chi
- 	pr_debug("sys_ptrace returning %d (DC = 0x%08lx)\n", ret, __mfdr(DBGREG_DC));
+ static void ptrace_single_step(struct task_struct *tsk)
+ {
+ 	pr_debug("ptrace_single_step: pid=%u, PC=0x%08lx, SR=0x%08lx\n",
+@@ -229,30 +226,38 @@ long arch_ptrace(struct task_struct *chi
+ 
  	return ret;
  }
 +#endif
@@ -106,19 +60,20 @@
 -asmlinkage void syscall_trace(void)
 +asmlinkage void syscall_trace(struct pt_regs *regs, int is_exit)
  {
--	pr_debug("syscall_trace called\n");
  	if (!test_thread_flag(TIF_SYSCALL_TRACE))
  		return;
 -	if (!(current->ptrace & PT_PTRACED))
 -		return;
  
--	pr_debug("syscall_trace: notifying parent\n");
--	/* The 0x80 provides a way for the tracing parent to
--	 * distinguish between a syscall stop and SIGTRAP delivery */
--	ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
--				 ? 0x80 : 0));
++<<<<<<< HEAD:arch/avr32/kernel/ptrace.c
 +	tracehook_report_syscall(regs, is_exit);
 +}
++=======
+ 	/* The 0x80 provides a way for the tracing parent to
+ 	 * distinguish between a syscall stop and SIGTRAP delivery */
+ 	ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
+ 				 ? 0x80 : 0));
++>>>>>>> 2c5ea0f2d8c7d4883dd0d8ec3c7e3f3640b4f814:arch/avr32/kernel/ptrace.c
  
 -	/*
 -	 * this isn't the same as continuing with a signal, but it
@@ -148,23 +103,10 @@
 +	force_sig_info(SIGTRAP, &info, tsk);
  }
  
- asmlinkage void do_debug_priv(struct pt_regs *regs)
-@@ -347,10 +297,10 @@ asmlinkage void do_debug(struct pt_regs 
- 			__mtdr(DBGREG_DC, dc);
- 
- 			clear_thread_flag(TIF_SINGLE_STEP);
--			ptrace_break(current, regs);
-+			do_breakpoint(current, regs);
- 		}
- 	} else {
- 		/* regular breakpoint */
--		ptrace_break(current, regs);
-+		do_breakpoint(current, regs);
- 	}
- }
+ /*
 --- linux-2.6/arch/avr32/kernel/process.c
 +++ linux-2.6/arch/avr32/kernel/process.c
-@@ -382,8 +382,6 @@ asmlinkage int sys_execve(char __user *u
+@@ -383,8 +383,6 @@ asmlinkage int sys_execve(char __user *u
  		goto out;
  
  	error = do_execve(filename, uargv, uenvp, regs);

linux-2.6-utrace-tracehook-s390.patch:

Index: linux-2.6-utrace-tracehook-s390.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook-s390.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace-tracehook-s390.patch	12 Nov 2007 08:19:34 -0000	1.3
+++ linux-2.6-utrace-tracehook-s390.patch	9 Dec 2007 02:01:29 -0000	1.4
@@ -26,7 +26,7 @@
  #include <linux/timer.h>
  #include <linux/mm.h>
  #include <linux/smp.h>
-@@ -339,7 +339,7 @@ void __kprobes do_single_step(struct pt_
+@@ -340,7 +340,7 @@ void __kprobes do_single_step(struct pt_
  					SIGTRAP) == NOTIFY_STOP){
  		return;
  	}
@@ -35,7 +35,7 @@
  		force_sig(SIGTRAP, current);
  }
  
-@@ -440,7 +440,7 @@ static void illegal_op(struct pt_regs * 
+@@ -441,7 +441,7 @@ static void illegal_op(struct pt_regs * 
  		if (get_user(*((__u16 *) opcode), (__u16 __user *) location))
  			return;
  		if (*((__u16 *) opcode) == S390_BREAKPOINT_U16) {

linux-2.6-utrace-tracehook.patch:

Index: linux-2.6-utrace-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-tracehook.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- linux-2.6-utrace-tracehook.patch	30 Nov 2007 14:55:05 -0000	1.18
+++ linux-2.6-utrace-tracehook.patch	9 Dec 2007 02:01:29 -0000	1.19
@@ -81,7 +81,7 @@
  arch/ia64/kernel/mca.c              |    2 
  arch/ia64/kernel/asm-offsets.c      |    2 
  arch/ia64/kernel/fsys.S             |   16 +
- kernel/exit.c                       |  240 ++++++--------------
+ kernel/exit.c                       |  238 +++++---------------
  kernel/ptrace.c                     |  307 +-------------------------
  kernel/timer.c                      |    4 
  kernel/signal.c                     |  210 ++++--------------
@@ -99,7 +99,7 @@
  include/asm-x86/signal.h            |    4 
  drivers/connector/cn_proc.c         |    4 
  mm/nommu.c                          |    4 
- 66 files changed, 857 insertions(+), 1142 deletions(-)
+ 66 files changed, 856 insertions(+), 1141 deletions(-)
  create include/linux/tracehook.h
  create include/asm-powerpc/tracehook.h
  create include/asm-x86/tracehook.h
@@ -1241,7 +1241,7 @@
  }
 --- linux-2.6/arch/x86/kernel/traps_64.c
 +++ linux-2.6/arch/x86/kernel/traps_64.c
-@@ -876,14 +876,6 @@ asmlinkage void __kprobes do_debug(struc
+@@ -885,14 +885,6 @@ asmlinkage void __kprobes do_debug(struc
  		 */
                  if (!user_mode(regs))
                         goto clear_TF_reenable;
@@ -1991,7 +1991,8 @@
  		/*
  		 * A group stop is in progress and this is the group leader.
  		 * We won't report until all threads have stopped.
-@@ -1383,12 +1303,11 @@ static int wait_task_stopped(struct task
+@@ -1382,13 +1302,12 @@ static int wait_task_stopped(struct task
+ 
  	if (unlikely(noreap)) {
  		uid_t uid = p->uid;
 -		int why = (p->ptrace & PT_PTRACED) ? CLD_TRAPPED : CLD_STOPPED;
@@ -1999,14 +2000,13 @@
  		exit_code = p->exit_code;
  		if (unlikely(!exit_code) || unlikely(p->exit_state))
  			goto bail_ref;
--		return wait_noreap_copyout(p, pid, uid,
+ 		return wait_noreap_copyout(p, pid, uid,
 -					   why, exit_code,
-+		return wait_noreap_copyout(p, pid, uid, CLD_STOPPED,
-+					   (exit_code << 8) | 0x7f,
++					   CLD_STOPPED, exit_code,
  					   infop, ru);
  	}
  
-@@ -1445,9 +1364,7 @@ bail_ref:
+@@ -1444,9 +1363,7 @@ bail_ref:
  	if (!retval && infop)
  		retval = put_user(0, &infop->si_errno);
  	if (!retval && infop)
@@ -2017,7 +2017,7 @@
  	if (!retval && infop)
  		retval = put_user(exit_code, &infop->si_status);
  	if (!retval && infop)
-@@ -1514,22 +1431,6 @@ static int wait_task_continued(struct ta
+@@ -1513,22 +1430,6 @@ static int wait_task_continued(struct ta
  }
  
  
@@ -2040,7 +2040,7 @@
  static long do_wait(pid_t pid, int options, struct siginfo __user *infop,
  		    int __user *stat_addr, struct rusage __user *ru)
  {
-@@ -1566,26 +1467,17 @@ repeat:
+@@ -1565,26 +1466,17 @@ repeat:
  
  			switch (p->state) {
  			case TASK_TRACED:
@@ -2071,7 +2071,7 @@
  					continue;
  				retval = wait_task_stopped(p, ret == 2,
  							   (options & WNOWAIT),
-@@ -1610,6 +1502,10 @@ repeat:
+@@ -1609,6 +1501,10 @@ repeat:
  						goto check_continued;
  					if (!likely(options & WEXITED))
  						continue;
@@ -2082,7 +2082,7 @@
  					retval = wait_task_zombie(
  						p, (options & WNOWAIT),
  						infop, stat_addr, ru);
-@@ -1626,6 +1522,8 @@ check_continued:
+@@ -1625,6 +1521,8 @@ check_continued:
  				flag = 1;
  				if (!unlikely(options & WCONTINUED))
  					continue;
@@ -2091,7 +2091,7 @@
  				retval = wait_task_continued(
  					p, (options & WNOWAIT),
  					infop, stat_addr, ru);
-@@ -1635,13 +1533,7 @@ check_continued:
+@@ -1634,13 +1532,7 @@ check_continued:
  			}
  		}
  		if (!flag) {
@@ -2106,7 +2106,7 @@
  		}
  		if (options & __WNOTHREAD)
  			break;
-@@ -1668,7 +1560,7 @@ end:
+@@ -1667,7 +1559,7 @@ end:
  	remove_wait_queue(&current->signal->wait_chldexit,&wait);
  	if (infop) {
  		if (retval > 0)
@@ -2932,8 +2932,8 @@
 +		tracehook_init_task(p);
  
  		if (thread_group_leader(p)) {
- 			if (clone_flags & CLONE_NEWPID) {
-@@ -1387,22 +1382,6 @@ struct task_struct * __cpuinit fork_idle
+ 			if (clone_flags & CLONE_NEWPID)
+@@ -1378,22 +1373,6 @@ struct task_struct * __cpuinit fork_idle
  	return task;
  }
  
@@ -2956,7 +2956,7 @@
  /*
   *  Ok, this is the main fork-routine.
   *
-@@ -1417,15 +1396,8 @@ long do_fork(unsigned long clone_flags,
+@@ -1408,15 +1387,8 @@ long do_fork(unsigned long clone_flags,
  	      int __user *child_tidptr)
  {
  	struct task_struct *p;
@@ -2972,7 +2972,7 @@
  	p = copy_process(clone_flags, stack_start, regs, stack_size,
  			child_tidptr, NULL);
  	/*
-@@ -1433,6 +1405,10 @@ long do_fork(unsigned long clone_flags,
+@@ -1424,6 +1396,10 @@ long do_fork(unsigned long clone_flags,
  	 * might get invalid after that point, if the thread exits quickly.
  	 */
  	if (!IS_ERR(p)) {
@@ -2983,7 +2983,7 @@
  		struct completion vfork;
  
  		/*
-@@ -1451,32 +1427,31 @@ long do_fork(unsigned long clone_flags,
+@@ -1442,32 +1418,31 @@ long do_fork(unsigned long clone_flags,
  			init_completion(&vfork);
  		}
  
@@ -3066,7 +3066,7 @@
  
 --- linux-2.6/include/linux/sched.h
 +++ linux-2.6/include/linux/sched.h
-@@ -915,7 +915,6 @@ struct task_struct {
+@@ -919,7 +919,6 @@ struct task_struct {
  	void *stack;
  	atomic_t usage;
  	unsigned int flags;	/* per process flags, defined below */
@@ -3074,7 +3074,7 @@
  
  	int lock_depth;		/* BKL lock depth */
  
-@@ -959,12 +958,6 @@ struct task_struct {
+@@ -963,12 +962,6 @@ struct task_struct {
  #endif
  
  	struct list_head tasks;
@@ -3087,7 +3087,7 @@
  
  	struct mm_struct *mm, *active_mm;
  
-@@ -984,15 +977,13 @@ struct task_struct {
+@@ -988,15 +981,13 @@ struct task_struct {
  	unsigned long stack_canary;
  #endif
  	/* 
@@ -3105,7 +3105,7 @@
  	 */
  	struct list_head children;	/* list of my children */
  	struct list_head sibling;	/* linkage in my parent's children list */
-@@ -1125,8 +1116,6 @@ struct task_struct {
+@@ -1129,8 +1120,6 @@ struct task_struct {
  
  	struct io_context *io_context;
  
@@ -3114,7 +3114,7 @@
  #ifdef CONFIG_TASK_XACCT
  /* i/o counters(bytes read/written, #syscalls */
  	u64 rchar, wchar, syscr, syscw;
-@@ -1316,7 +1305,7 @@ static inline pid_t task_session_vnr(str
+@@ -1320,7 +1309,7 @@ static inline pid_t task_session_vnr(str
  static inline pid_t task_ppid_nr_ns(struct task_struct *tsk,
  		struct pid_namespace *ns)
  {
@@ -3123,7 +3123,7 @@
  }
  
  /**
-@@ -1617,6 +1606,7 @@ extern int kill_pgrp(struct pid *pid, in
+@@ -1621,6 +1610,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);


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.691
retrieving revision 1.692
diff -u -r1.691 -r1.692
--- sources	7 Dec 2007 16:49:16 -0000	1.691
+++ sources	9 Dec 2007 02:01:29 -0000	1.692
@@ -1,3 +1,3 @@
 2cc2fd4d521dc5d7cfce0d8a9d1b3472  linux-2.6.23.tar.bz2
 c3c9958292c25c7fca24f713723636be  patch-2.6.24-rc4.bz2
-b48a66338c2fc063f87e861696cb5c8b  patch-2.6.24-rc4-git5.bz2
+285f56b21a2673228613221bc8971292  patch-2.6.24-rc4-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.613
retrieving revision 1.614
diff -u -r1.613 -r1.614
--- upstream	7 Dec 2007 16:49:16 -0000	1.613
+++ upstream	9 Dec 2007 02:01:29 -0000	1.614
@@ -1,3 +1,3 @@
 linux-2.6.23.tar.bz2
 patch-2.6.24-rc4.bz2
-patch-2.6.24-rc4-git5.bz2
+patch-2.6.24-rc4-git6.bz2


--- patch-2.6.24-rc4-git5.bz2.sign DELETED ---


