Changeset 06b0211b in mainline for kernel/arch/sparc64/src/proc/sun4u/scheduler.c

Timestamp:

2013-04-29T11:29:45Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

aa2b32c

Parents:

ba4799a (diff), df956b9b (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/sun4u/scheduler.c (modified) (3 diffs)

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

@@ -52 +52 @@
 {
         if (THREAD->uspace) {
+                uint64_t sp;
+
                 /*
                  * Write kernel stack address to %g6 of the alternate and
@@ -63 +65 @@
                  *   before it explicitly uses %g7.
                  */
-                uint64_t sp = (uintptr_t) THREAD->kstack + STACK_SIZE -
-                    (STACK_BIAS + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT));
+                sp = (uintptr_t) THREAD->kstack + STACK_SIZE - STACK_BIAS;
                 write_to_ig_g6(sp);
                 write_to_ag_g6(sp);
@@ -76 +77 @@
         if (THREAD->uspace) {
                 /* sample the state of the userspace window buffer */
-                THREAD->arch.uspace_window_buffer = (uint8_t *) read_from_ag_g7();
+                THREAD->arch.uspace_window_buffer =
+                    (uint8_t *) read_from_ag_g7();
         }
 }