Changeset f14291b in mainline for kernel/arch/amd64/src/boot/boot.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/boot/boot.S (modified) (4 diffs)

kernel/arch/amd64/src/boot/boot.S

@@ -85 +85 @@
         
         /* Kernel data + stack */
-        movw $gdtselector(KDATA_DES), %cx
+        movw $GDT_SELECTOR(KDATA_DES), %cx
         movw %cx, %es
         movw %cx, %ds
@@ -94 +94 @@
          * when _visible_ part of GS does not point to user-mode segment.
          */
-        movw $gdtselector(UDATA_DES), %cx
+        movw $GDT_SELECTOR(UDATA_DES), %cx
         movw %cx, %fs
         movw %cx, %gs
         
-        jmpl $gdtselector(KTEXT32_DES), $multiboot_meeting_point
+        jmpl $GDT_SELECTOR(KTEXT32_DES), $multiboot_meeting_point
         multiboot_meeting_point:
         
@@ -182 +182 @@
         
         /* At this point we are in compatibility mode */
-        jmpl $gdtselector(KTEXT_DES), $start64
+        jmpl $GDT_SELECTOR(KTEXT_DES), $start64
 
 /** Print string to EGA display (in light red) and halt.
@@ -645 +645 @@
 .section K_DATA_START, "aw", @progbits
 
-.global bootstrap_gdtr
 bootstrap_gdtr:
-        .word gdtselector(GDT_ITEMS)
+        .word GDT_SELECTOR(GDT_ITEMS)
         .long KA2PA(gdt)