svn commit: r258886 - stable/10/sys/amd64/include

[Konstantin Belousov]

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