Changes in kernel/arch/amd64/include/pm.h [dc0b964:99d6fd0] in mainline

File:

• kernel/arch/amd64/include/pm.h (modified) (4 diffs)

kernel/arch/amd64/include/pm.h

@@ -37 +37 @@
 
 #ifndef __ASM__
-        #include <typedefs.h>
+        #include <arch/types.h>
         #include <arch/context.h>
 #endif
@@ -65 +65 @@
 #endif /* CONFIG_FB */
 
-#define GDT_SELECTOR(des)  ((des) << 3)
+#define gdtselector(des)  ((des) << 3)
+#define idtselector(des)  ((des) << 4)
 
 #define PL_KERNEL  0
 #define PL_USER    3
 
-#define AR_PRESENT    (1 << 7)
+#define AR_PRESENT   ( 1 << 7)
 #define AR_DATA       (2 << 3)
 #define AR_CODE       (3 << 3)
 #define AR_WRITABLE   (1 << 1)
 #define AR_READABLE   (1 << 1)
-#define AR_TSS        (0x09U)
-#define AR_INTERRUPT  (0x0eU)
-#define AR_TRAP       (0x0fU)
+#define AR_TSS        (0x09)
+#define AR_INTERRUPT  (0x0e)
+#define AR_TRAP       (0x0f)
 
 #define DPL_KERNEL  (PL_KERNEL << 5)
@@ -83 +84 @@
 
 #define TSS_BASIC_SIZE  104
-#define TSS_IOMAP_SIZE  (8 * 1024 + 1)  /* 8K for bitmap + 1 terminating byte for convenience */
+#define TSS_IOMAP_SIZE  (16 * 1024 + 1)  /* 16K for bitmap + 1 terminating byte for convenience */
 
 #define IO_PORTS  (64 * 1024)
@@ -167 +168 @@
 
 extern ptr_16_64_t gdtr;
+extern ptr_16_32_t bootstrap_gdtr;
 extern ptr_16_32_t protected_ap_gdtr;