PERFORCE change 87828 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=87828

Change 87828 by peter at peter_daintree on 2005/12/06 22:05:14

	fix si_band

Affected files ...

.. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#18 edit
.. //depot/projects/hammer/sys/compat/ia32/ia32_signal.h#12 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#18 (text+ko) ====

@@ -754,5 +754,5 @@
 	dst->si_addr = dst->si_addr;
 	dst->si_value.sigval_int = src->si_value.sival_int;
 	dst->si_band = src->si_band;
-	dst->__spare__[0] = src->si_trapno;
+	dst->si_trapno = src->si_trapno;
 }

==== //depot/projects/hammer/sys/compat/ia32/ia32_signal.h#12 (text+ko) ====

@@ -155,8 +155,25 @@
 	int			si_status;	/* exit value */
 	u_int32_t		si_addr;	/* faulting instruction */
 	union ia32_sigval	si_value;	/* signal value */
-	int32_t			si_band;	/* band event for SIGPOLL */
-	int			__spare__[7];	/* gimme some slack */
+	union	{
+		struct {
+			int	_trapno;/* machine specific trap code */
+		} _fault;
+		struct {
+			int	_timerid;
+			int	_overrun;
+		} _timer;
+		struct {
+			int	_mqd;
+		} _mesgq;
+		struct {
+			int	_band;		/* band event for SIGPOLL */
+		} _poll;			/* was this ever used ? */
+		struct {
+			int	__spare1__;
+			int	__spare2__[7];
+		} __spare__;
+	} _reason;
 };
 
 #ifdef COMPAT_FREEBSD4