[Glibc-bsd-commits] r4223 - in trunk/kfreebsd-10/debian: . patches

[Robert Millan]

Author: rmh
Date: 2012-04-21 17:13:28 +0000 (Sat, 21 Apr 2012)
New Revision: 4223

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/921_signal_watchdog.diff
Log:
921_signal_watchdog.diff: Add a safety check to detect when the spares in struct sigevent are claimed by upstream (see #666454).

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2012-04-21 14:47:30 UTC (rev 4222)
+++ trunk/kfreebsd-10/debian/changelog	2012-04-21 17:13:28 UTC (rev 4223)
@@ -7,8 +7,10 @@
   * pty(4) was removed from GENERIC in 10-CURRENT (see rev 233271), but
     unfortunately glibc doesn't support pts(4) yet (see #667448).
     Reenable in sys/conf/DEBIAN.
+  * 921_signal_watchdog.diff: Add a safety check to detect when the
+    spares in struct sigevent are claimed by upstream (see #666454).
 
- -- Robert Millan <rmh at debian.org>  Wed, 18 Apr 2012 23:53:31 +0200
+ -- Robert Millan <rmh at debian.org>  Sat, 21 Apr 2012 19:12:52 +0200
 
 kfreebsd-10 (10.0~svn233872-1) experimental; urgency=low
 

Modified: trunk/kfreebsd-10/debian/patches/921_signal_watchdog.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/921_signal_watchdog.diff	2012-04-21 14:47:30 UTC (rev 4222)
+++ trunk/kfreebsd-10/debian/patches/921_signal_watchdog.diff	2012-04-21 17:13:28 UTC (rev 4223)
@@ -3,12 +3,14 @@
 incompatibilities with our userland.  When a possible problem happens, it
 will either stop applying or cause build failure.
 
-It handles two situations:
+It handles three situations:
 
   - If the kernel attempts to use SIGTHR, SIGLWP or SIGLIBRT (build failure).
 
   - When signal 34 is used by the kernel (patch will stop applying).
 
+  - The spares in struct sigevent are claimed by upstream (see #666454).
+
 --- a/sys/sys/signal.h
 +++ b/sys/sys/signal.h
 @@ -108,11 +108,7 @@
@@ -24,6 +26,15 @@
  
  #define	SIGRTMIN	65
  #define	SIGRTMAX	126
+@@ -171,6 +167,8 @@
+ 			void *_attribute; /* pthread_attr_t * */
+ 		} _sigev_thread;
+ 		unsigned short _kevent_flags;
++		/* This comment is a safety check to detect when the spares
++		   below are claimed by upstream (see #666454) */
+ 		long __spare__[8];
+ 	} _sigev_un;
+ };
 --- a/sys/kern/kern_prot.c
 +++ b/sys/kern/kern_prot.c
 @@ -1557,8 +1557,8 @@