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

Timestamp:

2010-10-19T20:55:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a93d79a

Parents:

1882525 (diff), a7a85d16 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

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

@@ -61 +61 @@
         orl $1, %eax
         movl %eax, %cr0     # switch to protected mode
-        jmpl $gdtselector(KTEXT32_DES), $jump_to_kernel - BOOT_OFFSET + AP_BOOT_OFFSET
+        jmpl $GDT_SELECTOR(KTEXT32_DES), $jump_to_kernel - BOOT_OFFSET + AP_BOOT_OFFSET
 
 jump_to_kernel:
 .code32
-        movw $gdtselector(KDATA_DES), %ax
+        movw $GDT_SELECTOR(KDATA_DES), %ax
         movw %ax, %ds
         movw %ax, %es
         movw %ax, %ss
-        movw $gdtselector(UDATA_DES), %ax
+        movw $GDT_SELECTOR(UDATA_DES), %ax
         movw %ax, %gs
         
@@ -94 +94 @@
         
         # At this point we are in compatibility mode
-        jmpl $gdtselector(KTEXT_DES), $start64 - BOOT_OFFSET + AP_BOOT_OFFSET
+        jmpl $GDT_SELECTOR(KTEXT_DES), $start64 - BOOT_OFFSET + AP_BOOT_OFFSET
 
 .code64