Changeset e6a78b9 in mainline for kernel/arch/mips32/src/mips32.c

Timestamp:

2012-06-29T15:31:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c (diff), 0bbd13e (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/mips32/src/mips32.c (modified) (1 diff)

kernel/arch/mips32/src/mips32.c

@@ -211 +211 @@
             cp0_status_um_bit | cp0_status_ie_enabled_bit));
         cp0_epc_write((uintptr_t) kernel_uarg->uspace_entry);
-        userspace_asm(((uintptr_t) kernel_uarg->uspace_stack + STACK_SIZE),
+        userspace_asm(((uintptr_t) kernel_uarg->uspace_stack +
+            kernel_uarg->uspace_stack_size),
             (uintptr_t) kernel_uarg->uspace_uarg,
             (uintptr_t) kernel_uarg->uspace_entry);