diff --git a/arch/x86/cpu_context.c b/arch/x86/cpu_context.c
index a1126b1..ea5d673 100644
--- a/arch/x86/cpu_context.c
+++ b/arch/x86/cpu_context.c
@@ -35,14 +35,14 @@ struct cpu_state {
                    Kernel context (CPL0) of the interrupted
                    thread, even for a user thread */
     uint16_t alignment_padding; /* unused */
-    uint32_t eax;
-    uint32_t ecx;
-    uint32_t edx;
-    uint32_t ebx;
-    uint32_t ebp;
-    uint32_t esp;
-    uint32_t esi;
     uint32_t edi;
+    uint32_t esi;
+    uint32_t esp;
+    uint32_t ebp;
+    uint32_t ebx;
+    uint32_t edx;
+    uint32_t ecx;
+    uint32_t eax;
 
     /* MUST NEVER CHANGE (dependent on the IA32 iret instruction) */
     uint32_t error_code;