diff --git a/sys/amd64/amd64.h b/sys/amd64/amd64.h
index 2552d5e..831f306 100644
--- a/sys/amd64/amd64.h
+++ b/sys/amd64/amd64.h
@@ -100,22 +100,22 @@ typedef struct PACKED InteruptGate64 {
  */
 
 typedef struct PACKED TaskStateSegment64 {
-    uint16_t    iomap_offset;
-    uint16_t    _unused0;
-    uint32_t    _unused1;
-    uint32_t    _unused2;
-    uint64_t    ist7;
-    uint64_t    ist6;
-    uint64_t    ist5;
-    uint64_t    ist4;
-    uint64_t    ist3;
-    uint64_t    ist2;
-    uint64_t    ist1;
-    uint64_t    _unused3;
-    uint64_t    rsp2;
-    uint64_t    rsp1;
+    uint32_t    _unused0;
     uint64_t    rsp0;
-    uint32_t    _unused4;
+    uint64_t    rsp1;
+    uint64_t    rsp2;
+    uint64_t    _unused1;
+    uint64_t    ist1;
+    uint64_t    ist2;
+    uint64_t    ist3;
+    uint64_t    ist4;
+    uint64_t    ist5;
+    uint64_t    ist6;
+    uint64_t    ist7;
+    uint32_t    _unused2;
+    uint32_t    _unused3;
+    uint16_t    _unused4;
+    uint16_t    iomap_offset;
 } TaskStateSegment64;
 
 /*