Re: siginfo broken in glibc

[Andreas Jaeger <aj at suse dot de>]

I'm appending part of a kernel patch which I'd like to forward to
Linus.  We need to fix the signal code also.  But before I do this I'd
like to get the information for all architectures so that we can fix
all includes first.

I'd like to hear if this patch would work on ix86? For m68k I'll
discuss this later with Andreas Schwab.

Cheers,
Andreas

--- include/asm-i386/siginfo.h.~1~	Tue Jan 11 03:29:05 2000
+++ include/asm-i386/siginfo.h	Wed Jan 19 09:42:47 2000
@@ -24,8 +24,7 @@
 		/* kill() */
 		struct {
 			pid_t _pid;		/* sender's pid */
-			old_uid_t _uid;		/* backwards compatibility */
-			uid_t _uid32;		/* sender's uid */
+			uid_t _uid;		/* sender's uid */
 		} _kill;
 
 		/* POSIX.1b timers */
@@ -37,19 +36,17 @@
 		/* POSIX.1b signals */
 		struct {
 			pid_t _pid;		/* sender's pid */
-			old_uid_t _uid;		/* backwards compatibility */
+			uid_t _uid;		/* sender's uid */
 			sigval_t _sigval;
-			uid_t _uid32;		/* sender's uid */
 		} _rt;
 
 		/* SIGCHLD */
 		struct {
 			pid_t _pid;		/* which child */
-			old_uid_t _uid;		/* backwards compatibility */
+			uid_t _uid;		/* sender's uid */
 			int _status;		/* exit code */
 			clock_t _utime;
 			clock_t _stime;
-			uid_t _uid32;		/* sender's uid */
 		} _sigchld;
 
 		/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
@@ -71,12 +68,7 @@
  * How these fields are to be accessed.
  */
 #define si_pid		_sifields._kill._pid
-#ifdef __KERNEL__
-#define si_uid		_sifields._kill._uid32
-#define si_uid16	_sifields._kill._uid
-#else
 #define si_uid		_sifields._kill._uid
-#endif /* __KERNEL__ */
 #define si_status	_sifields._sigchld._status
 #define si_utime	_sifields._sigchld._utime
 #define si_stime	_sifields._sigchld._stime

-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.rhein-neckar.de