Changeset f4f866c in mainline for kernel/generic/src/proc/scheduler.c

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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/generic/src/proc/scheduler.c (modified) (2 diffs)

kernel/generic/src/proc/scheduler.c

@@ -202 +202 @@
                  */
 
+                 spinlock_lock(&CPU->lock);
+                 CPU->idle = true;
+                 spinlock_unlock(&CPU->lock);
                  cpu_sleep();
                  goto loop;
@@ -313 +316 @@
                 spinlock_lock(&THREAD->lock);
                 
-                /* Update thread accounting */
-                THREAD->cycles += get_cycle() - THREAD->last_cycle;
+                /* Update thread kernel accounting */
+                THREAD->kcycles += get_cycle() - THREAD->last_cycle;
                 
 #ifndef CONFIG_FPU_LAZY