Changeset 8b36bf2 in mainline for kernel/arch/sparc64/src/proc/sun4v/scheduler.c

Timestamp:

2012-06-20T23:03:29Z (13 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/sparc64/src/proc/sun4v/scheduler.c (modified) (2 diffs)

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

@@ -54 +54 @@
 void before_thread_runs_arch(void)
 {
-        if ((THREAD->flags & THREAD_FLAG_USPACE)) {
+        if (THREAD->uspace) {
                 uint64_t sp = (uintptr_t) THREAD->kstack + STACK_SIZE -
                     (STACK_BIAS + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT));
@@ -66 +66 @@
 void after_thread_ran_arch(void)
 {
-        if ((THREAD->flags & THREAD_FLAG_USPACE)) {
-                /* sample the state of the userspace window buffer */   
+        if (THREAD->uspace) {
+                /* sample the state of the userspace window buffer */
                 THREAD->arch.uspace_window_buffer =
                     (uint8_t *) asi_u64_read(ASI_SCRATCHPAD, SCRATCHPAD_WBUF);