Changes in kernel/generic/src/interrupt/interrupt.c [63e27ef:e4d96e9] in mainline

File:

• kernel/generic/src/interrupt/interrupt.c (modified) (4 diffs)

kernel/generic/src/interrupt/interrupt.c

@@ -40 +40 @@
  */
 
-#include <assert.h>
 #include <interrupt.h>
+#include <debug.h>
 #include <console/kconsole.h>
 #include <console/console.h>
@@ -76 +76 @@
 {
 #if (IVT_ITEMS > 0)
-        assert(n < IVT_ITEMS);
+        ASSERT(n < IVT_ITEMS);
 #endif
         
@@ -102 +102 @@
 {
 #if (IVT_ITEMS > 0)
-        assert(n < IVT_ITEMS);
+        ASSERT(n < IVT_ITEMS);
 #endif
         
@@ -112 +112 @@
         }
         
-        /* Account CPU usage if it woke up from sleep */
-        if (CPU && CPU->idle) {
+        /* Account CPU usage if it has waked up from sleep */
+        if (CPU) {
                 irq_spinlock_lock(&CPU->lock, false);
-                uint64_t now = get_cycle();
-                CPU->idle_cycles += now - CPU->last_cycle;
-                CPU->last_cycle = now;
-                CPU->idle = false;
+                if (CPU->idle) {
+                        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);
         }