Changeset f126c87 in mainline for kernel/arch/ia32/src/smp/ap.S

Timestamp:

2016-09-01T16:46:27Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (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 from mainline.

File:

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

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

@@ -75 +75 @@
         movw %ax, %es
         movw %ax, %ss
-        movl $KA2PA(ctx), %eax          /* KA2PA((uintptr_t) &ctx) */
+        movl $KA2PA(ctx), %eax          /* KA2PA((uintptr_t) &ctx) */
         movl CONTEXT_OFFSET_SP(%eax), %esp
-        leal KA2PA(0)(%esp), %esp       /* KA2PA(ctx.sp) */
+        leal KA2PA(0)(%esp), %esp       /* KA2PA(ctx.sp) */
 
         /*
@@ -85 +85 @@
         call map_kernel_pse
         
-        addl $PA2KA(0), %esp            /* PA2KA(ctx.sp) */
+        addl $PA2KA(0), %esp            /* PA2KA(ctx.sp) */
         
         /* create the first stack frame */