Changes in kernel/arch/sparc64/src/proc/sun4u/scheduler.c [2277e03:5f678b1c] in mainline

File:

• kernel/arch/sparc64/src/proc/sun4u/scheduler.c (modified) (3 diffs)

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

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