From owner-svn-src-all@FreeBSD.ORG  Tue Dec  3 19:41:49 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5D62F2EB;
 Tue,  3 Dec 2013 19:41:49 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 48D331D60;
 Tue,  3 Dec 2013 19:41:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB3JfnIa063243;
 Tue, 3 Dec 2013 19:41:49 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB3JfmvR063238;
 Tue, 3 Dec 2013 19:41:48 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201312031941.rB3JfmvR063238@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Tue, 3 Dec 2013 19:41:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r258886 - stable/10/sys/amd64/include
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Dec 2013 19:41:49 -0000

Author: kib
Date: Tue Dec  3 19:41:48 2013
New Revision: 258886
URL: http://svnweb.freebsd.org/changeset/base/258886

Log:
  MFC r258660:
  Fix sys/sysctl.h use for cc -m32 on amd64.
  
  Approved by:	re (gjb)

Modified:
  stable/10/sys/amd64/include/pcb.h
  stable/10/sys/amd64/include/segments.h
Directory Properties:
  stable/10/sys/   (props changed)

Modified: stable/10/sys/amd64/include/pcb.h
==============================================================================
--- stable/10/sys/amd64/include/pcb.h	Tue Dec  3 19:40:32 2013	(r258885)
+++ stable/10/sys/amd64/include/pcb.h	Tue Dec  3 19:41:48 2013	(r258886)
@@ -43,6 +43,7 @@
 #include <machine/fpu.h>
 #include <machine/segments.h>
 
+#ifdef __amd64__
 struct pcb {
 	register_t	pcb_r15;
 	register_t	pcb_r14;
@@ -105,6 +106,7 @@ struct pcb {
 
 	uint64_t	pcb_pad[3];
 };
+#endif
 
 #ifdef _KERNEL
 struct trapframe;

Modified: stable/10/sys/amd64/include/segments.h
==============================================================================
--- stable/10/sys/amd64/include/segments.h	Tue Dec  3 19:40:32 2013	(r258885)
+++ stable/10/sys/amd64/include/segments.h	Tue Dec  3 19:41:48 2013	(r258886)
@@ -82,8 +82,8 @@ struct	soft_segment_descriptor {
  * region descriptors, used to load gdt/idt tables before segments yet exist.
  */
 struct region_descriptor {
-	unsigned long rd_limit:16;		/* segment extent */
-	unsigned long rd_base:64 __packed;	/* base address  */
+	uint64_t rd_limit:16;		/* segment extent */
+	uint64_t rd_base:64 __packed;	/* base address  */
 } __packed;
 
 #ifdef _KERNEL