Changes in kernel/arch/ia32/src/smp/ap.S [9d58539:0637ddb] in mainline

File:

• kernel/arch/ia32/src/smp/ap.S (modified) (6 diffs)

kernel/arch/ia32/src/smp/ap.S

@@ -32 +32 @@
  */
 
+#include <abi/asmtool.h>
 #include <arch/boot/boot.h>
 #include <arch/boot/memmap.h>
 #include <arch/mm/page.h>
 #include <arch/pm.h>
+#include <arch/cpu.h>
+#include <arch/context_struct.h>
 
 .section K_TEXT_START, "ax"
 
 #ifdef CONFIG_SMP
-
-.global unmapped_ap_boot
 
 KTEXT=8
@@ -53 +54 @@
 
 .align 4096
-unmapped_ap_boot:
+SYMBOL(unmapped_ap_boot)
 .code16
         cli
@@ -64 +65 @@
         /* switch to protected mode */
         movl %cr0, %eax
-        orl $1, %eax
+        orl $CR0_PE, %eax
         movl %eax, %cr0
         jmpl $KTEXT, $jump_to_kernel - BOOT_OFFSET + AP_BOOT_OFFSET
@@ -74 +75 @@
         movw %ax, %es
         movw %ax, %ss
-        movl $KA2PA(ctx), %eax  /* KA2PA((uintptr_t) &ctx) */
-        movl (%eax), %esp
-        subl $0x80000000, %esp  /* KA2PA(ctx.sp) */
+        movl $KA2PA(ctx), %eax          /* KA2PA((uintptr_t) &ctx) */
+        movl CONTEXT_OFFSET_SP(%eax), %esp
+        leal KA2PA(0)(%esp), %esp       /* KA2PA(ctx.sp) */
 
         /*
@@ -84 +85 @@
         call map_kernel_pse
         
-        addl $0x80000000, %esp  /*  PA2KA(ctx.sp) */
+        addl $PA2KA(0), %esp            /* PA2KA(ctx.sp) */
         
         /* create the first stack frame */
@@ -99 +100 @@
 #ifdef CONFIG_SMP
 
-.global unmapped_ap_gdtr
-
-unmapped_ap_gdtr:
+SYMBOL(unmapped_ap_gdtr)
         .word 0
         .long 0