[Glibc-bsd-commits] r4769 - trunk/kfreebsd-9/debian/patches

[Robert Millan]

Author: rmh
Date: 2013-07-19 19:32:52 +0000 (Fri, 19 Jul 2013)
New Revision: 4769

Modified:
   trunk/kfreebsd-9/debian/patches/000_zombie.diff
   trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff
Log:
Refresh

Modified: trunk/kfreebsd-9/debian/patches/000_zombie.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/000_zombie.diff	2013-07-19 16:59:05 UTC (rev 4768)
+++ trunk/kfreebsd-9/debian/patches/000_zombie.diff	2013-07-19 19:32:52 UTC (rev 4769)
@@ -15,8 +15,8 @@
 MFC r243528 (by pjd):
 Look for zombie process only if we were given process id.
 
---- a/sys/fs/nfsclient/nfs_clport.c	(revision 243961)
-+++ b/sys/fs/nfsclient/nfs_clport.c	(revision 243962)
+--- a/sys/fs/nfsclient/nfs_clport.c
++++ b/sys/fs/nfsclient/nfs_clport.c
 @@ -1150,31 +1150,6 @@
  }
  
@@ -49,10 +49,9 @@
   * Check to see if the process for this owner exists. Return 1 if it doesn't
   * and 0 otherwise.
   */
-
---- a/sys/sys/proc.h	(revision 243961)
-+++ b/sys/sys/proc.h	(revision 243962)
-@@ -835,6 +835,7 @@
+--- a/sys/sys/proc.h
++++ b/sys/sys/proc.h
+@@ -829,6 +829,7 @@
  extern struct uma_zone *proc_zone;
  
  struct	proc *pfind(pid_t);		/* Find process by id. */
@@ -60,9 +59,9 @@
  struct	pgrp *pgfind(pid_t);		/* Find process group by id. */
  struct	proc *zpfind(pid_t);		/* Find zombie process by id. */
  
---- a/sys/kern/kern_proc.c	(revision 243961)
-+++ b/sys/kern/kern_proc.c	(revision 243962)
-@@ -137,6 +137,7 @@
+--- a/sys/kern/kern_proc.c
++++ b/sys/kern/kern_proc.c
+@@ -136,6 +136,7 @@
  static int proc_init(void *mem, int size, int flags);
  static void proc_fini(void *mem, int size);
  static void pargs_free(struct pargs *pa);
@@ -70,7 +69,7 @@
  
  /*
   * Other process lists
-@@ -284,20 +285,13 @@
+@@ -283,20 +284,13 @@
  	return (1);
  }
  
@@ -95,7 +94,7 @@
  		if (p->p_pid == pid) {
  			PROC_LOCK(p);
  			if (p->p_state == PRS_NEW) {
-@@ -306,17 +300,34 @@
+@@ -305,17 +299,34 @@
  			}
  			break;
  		}
@@ -132,7 +131,7 @@
  	FOREACH_PROC_IN_SYSTEM(p) {
  		PROC_LOCK(p);
  		if (p->p_state == PRS_NEW) {
-@@ -330,7 +341,6 @@
+@@ -329,7 +340,6 @@
  		PROC_UNLOCK(p);
  	}
  found:
@@ -140,7 +139,7 @@
  	return (p);
  }
  
-@@ -364,12 +374,17 @@
+@@ -363,12 +373,17 @@
  	struct proc *p;
  	int error;
  
@@ -163,7 +162,7 @@
  	if (p == NULL)
  		return (ESRCH);
  	if ((flags & PGET_CANSEE) != 0) {
-@@ -1046,6 +1061,21 @@
+@@ -1049,6 +1064,21 @@
  	free(ps, M_SUBPROC);
  }
  
@@ -185,7 +184,7 @@
  /*
   * Locate a zombie process by number
   */
-@@ -1055,11 +1085,7 @@
+@@ -1058,11 +1088,7 @@
  	struct proc *p;
  
  	sx_slock(&allproc_lock);

Modified: trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff	2013-07-19 16:59:05 UTC (rev 4768)
+++ trunk/kfreebsd-9/debian/patches/950_no_stack_protector.diff	2013-07-19 19:32:52 UTC (rev 4769)
@@ -19,7 +19,7 @@
  CFLAGS+=	-fstack-protector
 --- a/sys/conf/kmod.mk
 +++ b/sys/conf/kmod.mk
-@@ -144,6 +144,9 @@
+@@ -141,6 +141,9 @@
  CTFFLAGS+=	-g
  .endif