Changes in kernel/generic/src/interrupt/interrupt.c [04e3d9f:d0c82c5] in mainline

File:

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

kernel/generic/src/interrupt/interrupt.c

@@ -55 +55 @@
 #include <arch/cycle.h>
 #include <str.h>
-#include <trace.h>
 
 exc_table_t exc_table[IVT_ITEMS];
@@ -98 +97 @@
  *
  */
-NO_TRACE void exc_dispatch(unsigned int n, istate_t *istate)
-{
+void exc_dispatch(unsigned int n, istate_t *istate)
+{
+        ASSERT(CPU);
+        
 #if (IVT_ITEMS > 0)
         ASSERT(n < IVT_ITEMS);
@@ -112 +113 @@
         
         /* Account CPU usage if it has waked up from sleep */
-        if (CPU) {
-                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;
-                }
-                irq_spinlock_unlock(&CPU->lock, false);
-        }
+        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;
+        }
+        irq_spinlock_unlock(&CPU->lock, false);
         
         uint64_t begin_cycle = get_cycle();
@@ -144 +143 @@
         uint64_t end_cycle = get_cycle();
         
-        irq_spinlock_lock(&exctbl_lock, false);
         exc_table[n].cycles += end_cycle - begin_cycle;
         exc_table[n].count++;
-        irq_spinlock_unlock(&exctbl_lock, false);
         
         /* Do not charge THREAD for exception cycles */
@@ -160 +157 @@
  *
  */
-NO_TRACE static void exc_undef(unsigned int n, istate_t *istate)
+static void exc_undef(unsigned int n, istate_t *istate)
 {
         fault_if_from_uspace(istate, "Unhandled exception %u.", n);
@@ -169 +166 @@
  *
  */
-NO_TRACE void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
+void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
 {
         if (!istate_from_uspace(istate))
@@ -216 +213 @@
  *
  */
-NO_TRACE static int cmd_exc_print(cmd_arg_t *argv)
+static int cmd_exc_print(cmd_arg_t *argv)
 {
         bool excs_all;