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

Timestamp:

2011-05-31T22:58:56Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d362410

Parents:

82582e4 (diff), 4ce90544 (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) (2 diffs)

kernel/arch/mips32/src/mips32.c

@@ -220 +220 @@
             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 + PAGE_SIZE), 
+        userspace_asm(((uintptr_t) kernel_uarg->uspace_stack + STACK_SIZE),
             (uintptr_t) kernel_uarg->uspace_uarg,
             (uintptr_t) kernel_uarg->uspace_entry);
@@ -235 +235 @@
 void before_thread_runs_arch(void)
 {
-        supervisor_sp = (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE -
-            SP_DELTA];
+        supervisor_sp =
+            (uintptr_t) &THREAD->kstack[STACK_SIZE - SP_DELTA];
 }