summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/amd64/include/pcb.h2
-rw-r--r--sys/amd64/include/segments.h4
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
OpenPOWER on IntegriCloud