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

Timestamp:

2012-06-29T15:31:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c (diff), 0bbd13e (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) (2 diffs)

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

@@ -51 +51 @@
 void before_thread_runs_arch(void)
 {
-        if ((THREAD->flags & THREAD_FLAG_USPACE)) {
+        if (THREAD->uspace) {
                 /*
                  * Write kernel stack address to %g6 of the alternate and
@@ -74 +74 @@
 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 *) read_from_ag_g7();
         }