Changes in kernel/generic/src/interrupt/interrupt.c [11909ce3:dfb16c4] in mainline

File:

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

kernel/generic/src/interrupt/interrupt.c

@@ -114 +114 @@
 
         /* Account user cycles */
-        if (THREAD)
+        if (THREAD) {
+                irq_spinlock_lock(&THREAD->lock, false);
                 thread_update_accounting(true);
+                irq_spinlock_unlock(&THREAD->lock, false);
+        }
 
         /* Account CPU usage if it woke up from sleep */
-        if (CPU && CPU_LOCAL->idle) {
+        if (CPU && CPU->idle) {
                 uint64_t now = get_cycle();
-                atomic_time_increment(&CPU->idle_cycles, now - CPU_LOCAL->last_cycle);
-                CPU_LOCAL->last_cycle = now;
-                CPU_LOCAL->idle = false;
+                atomic_time_increment(&CPU->idle_cycles, now - CPU->last_cycle);
+                CPU->last_cycle = now;
+                CPU->idle = false;
         }
 
@@ -152 +155 @@
 
         /* Do not charge THREAD for exception cycles */
-        if (THREAD)
+        if (THREAD) {
+                irq_spinlock_lock(&THREAD->lock, false);
                 THREAD->last_cycle = end_cycle;
+                irq_spinlock_unlock(&THREAD->lock, false);
+        }
 #else
         panic("No space for any exception handler, yet we want to handle some exception.");