Changeset 2b95d13 in mainline for kernel/arch/sparc64/src/proc/sun4v/scheduler.c

Timestamp:

2013-03-12T21:07:15Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

606f6a1

Parents:

976c434 (diff), eceff5f (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/sparc64/src/proc/sun4v/scheduler.c (modified) (1 diff)

kernel/arch/sparc64/src/proc/sun4v/scheduler.c

@@ -55 +55 @@
 {
         if (THREAD->uspace) {
-                uint64_t sp = (uintptr_t) THREAD->kstack + STACK_SIZE -
-                    (STACK_BIAS + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT));
+                uint64_t sp;
+
+                sp = (uintptr_t) THREAD->kstack + STACK_SIZE - STACK_BIAS;
                 asi_u64_write(ASI_SCRATCHPAD, SCRATCHPAD_KSTACK, sp);
                 asi_u64_write(ASI_SCRATCHPAD, SCRATCHPAD_WBUF,