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

Timestamp:

2010-03-07T15:11:56Z (15 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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, revision 308

File:

• kernel/generic/src/proc/scheduler.c (modified) (1 diff)

kernel/generic/src/proc/scheduler.c

@@ -542 +542 @@
 {
         thread_t *t;
-        int count, average, j, k = 0;
+        int count;
+        atomic_count_t average;
         unsigned int i;
+        int j;
+        int k = 0;
         ipl_t ipl;