rpms/kernel/devel kernel.spec, 1.245, 1.246 linux-2.6-utrace-tracehook.patch, 1.16, 1.17

[Dave Jones (davej)]

Author: davej

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

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


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- kernel.spec	16 Nov 2007 18:51:26 -0000	1.245
+++ kernel.spec	16 Nov 2007 20:28:54 -0000	1.246
@@ -1092,7 +1092,7 @@
 # wireless patches headed for 2.6.24
 #ApplyPatch linux-2.6-wireless.patch
 # wireless patches headed for 2.6.25
-ApplyPatch linux-2.6-rt2x00-updates.patch
+#ApplyPatch linux-2.6-rt2x00-updates.patch
 
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch

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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- linux-2.6-utrace-tracehook.patch	12 Nov 2007 08:19:34 -0000	1.16
+++ linux-2.6-utrace-tracehook.patch	16 Nov 2007 20:28:54 -0000	1.17
@@ -1991,15 +1991,14 @@
  		/*
  		 * A group stop is in progress and this is the group leader.
  		 * We won't report until all threads have stopped.
-@@ -1383,14 +1303,13 @@ static int wait_task_stopped(struct task
+@@ -1383,13 +1303,12 @@ static int wait_task_stopped(struct task
  	if (unlikely(noreap)) {
  		pid_t pid = task_pid_nr_ns(p, ns);
  		uid_t uid = p->uid;
 -		int why = (p->ptrace & PT_PTRACED) ? CLD_TRAPPED : CLD_STOPPED;
  
  		exit_code = p->exit_code;
- 		if (unlikely(!exit_code) ||
- 		    unlikely(p->state & TASK_TRACED))
+ 		if (unlikely(!exit_code) || unlikely(p->exit_state))
  			goto bail_ref;
 -		return wait_noreap_copyout(p, pid, uid,
 -					   why, (exit_code << 8) | 0x7f,
@@ -2008,7 +2007,7 @@
  					   infop, ru);
  	}
  
-@@ -1446,9 +1365,7 @@ bail_ref:
+@@ -1445,9 +1364,7 @@ bail_ref:
  	if (!retval && infop)
  		retval = put_user(0, &infop->si_errno);
  	if (!retval && infop)
@@ -2019,7 +2018,7 @@
  	if (!retval && infop)
  		retval = put_user(exit_code, &infop->si_status);
  	if (!retval && infop)
-@@ -1515,22 +1432,6 @@ static int wait_task_continued(struct ta
+@@ -1514,22 +1431,6 @@ static int wait_task_continued(struct ta
  }
  
  
@@ -2042,7 +2041,7 @@
  static long do_wait(pid_t pid, int options, struct siginfo __user *infop,
  		    int __user *stat_addr, struct rusage __user *ru)
  {
-@@ -1567,26 +1468,17 @@ repeat:
+@@ -1566,26 +1467,17 @@ repeat:
  
  			switch (p->state) {
  			case TASK_TRACED:
@@ -2073,7 +2072,7 @@
  					continue;
  				retval = wait_task_stopped(p, ret == 2,
  							   (options & WNOWAIT),
-@@ -1611,6 +1503,10 @@ repeat:
+@@ -1610,6 +1502,10 @@ repeat:
  						goto check_continued;
  					if (!likely(options & WEXITED))
  						continue;
@@ -2084,7 +2083,7 @@
  					retval = wait_task_zombie(
  						p, (options & WNOWAIT),
  						infop, stat_addr, ru);
-@@ -1627,6 +1523,8 @@ check_continued:
+@@ -1626,6 +1522,8 @@ check_continued:
  				flag = 1;
  				if (!unlikely(options & WCONTINUED))
  					continue;
@@ -2093,7 +2092,7 @@
  				retval = wait_task_continued(
  					p, (options & WNOWAIT),
  					infop, stat_addr, ru);
-@@ -1636,13 +1534,7 @@ check_continued:
+@@ -1635,13 +1533,7 @@ check_continued:
  			}
  		}
  		if (!flag) {
@@ -2108,7 +2107,7 @@
  		}
  		if (options & __WNOTHREAD)
  			break;
-@@ -1669,7 +1561,7 @@ end:
+@@ -1668,7 +1560,7 @@ end:
  	remove_wait_queue(&current->signal->wait_chldexit,&wait);
  	if (infop) {
  		if (retval > 0)