diff options
| author | kib <kib@FreeBSD.org> | 2013-12-03 19:41:48 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2013-12-03 19:41:48 +0000 |
| commit | 9934b5683d427d9de7457fc6b743dd7eb0fe35ab (patch) | |
| tree | cd83c4ba6e46d117a4ea077b5cecc77b9334c2df /sys/amd64/include | |
| parent | b3b0fb1cda32d26c5c353d4007a70a46b7dc5017 (diff) | |
| download | FreeBSD-src-9934b5683d427d9de7457fc6b743dd7eb0fe35ab.zip FreeBSD-src-9934b5683d427d9de7457fc6b743dd7eb0fe35ab.tar.gz | |
MFC r258660:
Fix sys/sysctl.h use for cc -m32 on amd64.
Approved by: re (gjb)
Diffstat (limited to 'sys/amd64/include')
| -rw-r--r-- | sys/amd64/include/pcb.h | 2 | ||||
| -rw-r--r-- | sys/amd64/include/segments.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h index c106edc..80aff86 100644 --- a/sys/amd64/include/pcb.h +++ b/sys/amd64/include/pcb.h @@ -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; diff --git a/sys/amd64/include/segments.h b/sys/amd64/include/segments.h index d9f4280..6bcadc7 100644 --- a/sys/amd64/include/segments.h +++ b/sys/amd64/include/segments.h @@ -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 |
