From owner-svn-src-head@FreeBSD.ORG  Wed Apr  1 13:44:29 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 34D3A10656CD;
	Wed,  1 Apr 2009 13:44:29 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 21B608FC1E;
	Wed,  1 Apr 2009 13:44:29 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n31DiTZA033504;
	Wed, 1 Apr 2009 13:44:29 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n31DiSiD033502;
	Wed, 1 Apr 2009 13:44:28 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <200904011344.n31DiSiD033502@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 1 Apr 2009 13:44:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190623 - in head/sys: amd64/include i386/include
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Apr 2009 13:44:30 -0000

Author: kib
Date: Wed Apr  1 13:44:28 2009
New Revision: 190623
URL: http://svn.freebsd.org/changeset/base/190623

Log:
  Sync definitions for struct sigcontext for i386 and amd64 architectures
  to struct mcontext.

Modified:
  head/sys/amd64/include/signal.h
  head/sys/i386/include/signal.h

Modified: head/sys/amd64/include/signal.h
==============================================================================
--- head/sys/amd64/include/signal.h	Wed Apr  1 13:12:40 2009	(r190622)
+++ head/sys/amd64/include/signal.h	Wed Apr  1 13:44:28 2009	(r190623)
@@ -78,9 +78,13 @@ struct sigcontext {
 	long	sc_r13;
 	long	sc_r14;
 	long	sc_r15;
-	long	sc_trapno;
+	int	sc_trapno;
+	short	sc_fs;
+	short	sc_gs;
 	long	sc_addr;
-	long	sc_flags;
+	int	sc_flags;
+	short	sc_es;
+	short	sc_ds;
 	long	sc_err;
 	long	sc_rip;
 	long	sc_cs;
@@ -95,7 +99,11 @@ struct sigcontext {
 	long	sc_fpformat;
 	long	sc_ownedfp;
 	long	sc_fpstate[64] __aligned(16);
-	long	sc_spare[8];
+
+	long	sc_fsbase;
+	long	sc_gsbase;
+
+	long	sc_spare[6];
 };
 #endif /* __BSD_VISIBLE */
 

Modified: head/sys/i386/include/signal.h
==============================================================================
--- head/sys/i386/include/signal.h	Wed Apr  1 13:12:40 2009	(r190622)
+++ head/sys/i386/include/signal.h	Wed Apr  1 13:44:28 2009	(r190623)
@@ -116,7 +116,11 @@ struct sigcontext {
 	int	sc_ownedfp;
 	int	sc_spare1[1];
 	int	sc_fpstate[128] __aligned(16);
-	int	sc_spare2[8];
+
+	int	sc_fsbase;
+	int	sc_gsbase;
+
+	int	sc_spare2[6];
 };
 
 #define	sc_sp		sc_esp