Changeset dc5c303 in mainline for kernel/generic/src/time/clock.c

Timestamp:

2023-12-28T13:59:23Z (15 months ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (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.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

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

kernel/generic/src/time/clock.c

@@ -123 +123 @@
 static void cpu_update_accounting(void)
 {
-        irq_spinlock_lock(&CPU->lock, false);
         uint64_t now = get_cycle();
-        CPU->busy_cycles += now - CPU->last_cycle;
+        atomic_time_increment(&CPU->busy_cycles, now - CPU->last_cycle);
         CPU->last_cycle = now;
-        irq_spinlock_unlock(&CPU->lock, false);
 }