Changeset 97c7682 in mainline for kernel/arch/ia32/src/userspace.c

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• kernel/arch/ia32/src/userspace.c (modified) (2 diffs)

kernel/arch/ia32/src/userspace.c

@@ -63 +63 @@
                 
                 "pushl %[udata_des]\n"
-                "pushl %[stack_size]\n"
+                "pushl %[stack_top]\n"
                 "pushl %[ipl]\n"
                 "pushl %[utext_des]\n"
@@ -75 +75 @@
                 :
                 : [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
-                  [stack_size] "r" ((uint8_t *) kernel_uarg->uspace_stack + STACK_SIZE),
+                  [stack_top] "r" ((uint8_t *) kernel_uarg->uspace_stack +
+                      kernel_uarg->uspace_stack_size),
                   [ipl] "r" (ipl),
                   [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),