Changeset 25a76ab8 in mainline for kernel/generic/src/time/clock.c

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (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/time/clock.c (modified) (1 diff)

kernel/generic/src/time/clock.c

@@ -140 +140 @@
         /* Account lost ticks to CPU usage */
         if (CPU->idle) {
-                ASSERT(missed_clock_ticks == 0);
-                CPU->idle_ticks++;
+                CPU->idle_ticks += missed_clock_ticks + 1;
         } else {
                 CPU->busy_ticks += missed_clock_ticks + 1;