Changeset b1c57a8 in mainline for kernel/generic/src/interrupt/interrupt.c

Timestamp:

2014-10-09T15:03:55Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e367939c

Parents:

21799398 (diff), 207e8880 (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 from lp:~adam-hraska+lp/helenos/rcu/.

Only merge from the feature branch and resolve all conflicts.

File:

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

kernel/generic/src/interrupt/interrupt.c

@@ -112 +112 @@
         }
         
-        /* Account CPU usage if it has waked up from sleep */
-        if (CPU) {
+        /* Account CPU usage if it woke up from sleep */
+        if (CPU && CPU->idle) {
                 irq_spinlock_lock(&CPU->lock, false);
-                if (CPU->idle) {
-                        uint64_t now = get_cycle();
-                        CPU->idle_cycles += now - CPU->last_cycle;
-                        CPU->last_cycle = now;
-                        CPU->idle = false;
-                }
+                uint64_t now = get_cycle();
+                CPU->idle_cycles += now - CPU->last_cycle;
+                CPU->last_cycle = now;
+                CPU->idle = false;
                 irq_spinlock_unlock(&CPU->lock, false);
         }