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

Timestamp:

2010-02-23T19:03:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (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) (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;