Changeset 8b36bf2 in mainline for kernel/arch/ppc32/src/ppc32.c

Timestamp:

2012-06-20T23:03:29Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

d5070ef

Parents:

8375d0eb (diff), 6eef3c4 (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/ppc32/src/ppc32.c (modified) (1 diff)

kernel/arch/ppc32/src/ppc32.c

@@ -269 +269 @@
 {
         userspace_asm((uintptr_t) kernel_uarg->uspace_uarg,
-            (uintptr_t) kernel_uarg->uspace_stack + STACK_SIZE - SP_DELTA,
+            (uintptr_t) kernel_uarg->uspace_stack +
+            kernel_uarg->uspace_stack_size - SP_DELTA,
             (uintptr_t) kernel_uarg->uspace_entry);