Ticket #5217: x86_enter_userspace.patch

src/system/kernel/arch/x86/arch_x86.S

@@ -164 +164 @@
 FUNCTION(x86_enter_userspace):
     movl    4(%esp), %eax   // get entry point
     movl    8(%esp), %ebx   // get user stack
-    movw    $USER_DATA_SEG, %cx
+    movl    $USER_DATA_SEG, %ecx
+    xorl    %ebp, %ebp      // this is the last stack frame - we don't need one on return
+                            // (%ebp marks the beginning of this stack frame)
     movw    %cx, %ds
     movw    %cx, %es
     //movw  $0x33 + cpu_num, %fs    -> fs points to the TLS storage (CPU dependent segment)
     movw    %cx, %gs
 
-    xorl    %ebp, %ebp      // this is the last stack frame - we don't need one on return
-                            // (%ebp marks the beginning of this stack frame)
-    pushl   $USER_DATA_SEG  // user data segment
+    pushl   %ecx            // user data segment
     pushl   %ebx            // user stack
     pushl   $(1 << 9) | 2   // user flags
     pushl   $USER_CODE_SEG  // user code segment