Changeset 6e5252a in mainline for kernel/arch/amd64/src/smp/ap.S

Timestamp:

2018-11-13T20:22:20Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

156bae23

Parents:

2214382

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-10-23 21:48:41)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-13 20:22:20)

Message:

Place AP bootstrap correctly via linker script instead of manual copy

File:

• kernel/arch/amd64/src/smp/ap.S (modified) (5 diffs)

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

@@ -41 +41 @@
 #include <arch/context_struct.h>
 
-.section K_TEXT_START, "ax"
+.section K_AP_TEXT_START, "ax"
 
 #ifdef CONFIG_SMP
@@ -50 +50 @@
 
 .align 4096
-SYMBOL(unmapped_ap_boot)
+
+SYMBOL(ap_boot)
 .code16
         cli
@@ -61 +62 @@
         orl $CR0_PE, %eax
         movl %eax, %cr0     # switch to protected mode
-        jmpl $GDT_SELECTOR(KTEXT32_DES), $jump_to_kernel - BOOT_OFFSET + AP_BOOT_OFFSET
+        jmpl $GDT_SELECTOR(KTEXT32_DES), $jump_to_kernel
 
 jump_to_kernel:
@@ -94 +95 @@
 
         # At this point we are in compatibility mode
-        jmpl $GDT_SELECTOR(KTEXT_DES), $start64 - BOOT_OFFSET + AP_BOOT_OFFSET
+        jmpl $GDT_SELECTOR(KTEXT_DES), $start64
 
 .code64
@@ -109 +110 @@
 #endif /* CONFIG_SMP */
 
-.section K_DATA_START, "aw", @progbits
+.section K_AP_DATA_START, "aw", @progbits
 
 #ifdef CONFIG_SMP
 
-SYMBOL(unmapped_ap_gdtr)
+SYMBOL(ap_gdtr)
         .word 0
         .long 0