Changeset f4f866c in mainline for kernel/generic/src/time/clock.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/time/clock.c (modified) (2 diffs)

kernel/generic/src/time/clock.c

@@ -86 +86 @@
         uptime->seconds1 = 0;
         uptime->seconds2 = 0;
-        uptime->useconds = 0; 
+        uptime->useconds = 0;
 
         clock_parea.pbase = (uintptr_t) faddr;
@@ -137 +137 @@
         size_t missed_clock_ticks = CPU->missed_clock_ticks;
         unsigned int i;
+
+        /* Account lost ticks to CPU usage */
+        if (CPU->idle) {
+                ASSERT(missed_clock_ticks == 0);
+                CPU->idle_ticks++;
+        } else {
+                CPU->busy_ticks += missed_clock_ticks + 1;
+        }
+        CPU->idle = false;
 
         /*