Changeset dc5c303 in mainline for kernel/generic/src/cpu/cpu.c

Timestamp:

2023-12-28T13:59:23Z (2 years 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/cpu/cpu.c (modified) (3 diffs)

kernel/generic/src/cpu/cpu.c

@@ -45 +45 @@
 #include <config.h>
 #include <panic.h>
-#include <mem.h>
+#include <memw.h>
 #include <adt/list.h>
 #include <stdio.h>
@@ -84 +84 @@
                         cpus[i].id = i;
 
-                        irq_spinlock_initialize(&cpus[i].lock, "cpus[].lock");
+#ifdef CONFIG_FPU_LAZY
+                        irq_spinlock_initialize(&cpus[i].fpu_lock, "cpus[].fpu_lock");
+#endif
+                        irq_spinlock_initialize(&cpus[i].tlb_lock, "cpus[].tlb_lock");
 
                         for (unsigned int j = 0; j < RQ_COUNT; j++) {
@@ -103 +106 @@
         CPU->idle = false;
         CPU->last_cycle = get_cycle();
-        CPU->idle_cycles = 0;
-        CPU->busy_cycles = 0;
+        CPU->idle_cycles = ATOMIC_TIME_INITIALIZER();
+        CPU->busy_cycles = ATOMIC_TIME_INITIALIZER();
 
         cpu_identify();