From owner-p4-projects@FreeBSD.ORG  Tue Dec  6 22:05:31 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8992C16A423; Tue,  6 Dec 2005 22:05:30 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5E67316A420
	for <perforce@freebsd.org>; Tue,  6 Dec 2005 22:05:30 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2464743D49
	for <perforce@freebsd.org>; Tue,  6 Dec 2005 22:05:30 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB6M5T3t080613
	for <perforce@freebsd.org>; Tue, 6 Dec 2005 22:05:30 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB6M5TqQ080610
	for perforce@freebsd.org; Tue, 6 Dec 2005 22:05:29 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 6 Dec 2005 22:05:29 GMT
Message-Id: <200512062205.jB6M5TqQ080610@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 87828 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Dec 2005 22:05:31 -0000

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

Change 87828 by peter@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