Changes in kernel/generic/src/cpu/cpu.c [4760793:128359eb] in mainline

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 <memw.h>
+#include <mem.h>
 #include <adt/list.h>
 #include <stdio.h>
@@ -81 +81 @@
                                 panic("Cannot allocate CPU stack.");
 
-                        cpus[i].local.stack = (uint8_t *) PA2KA(stack_phys);
+                        cpus[i].stack = (uint8_t *) PA2KA(stack_phys);
                         cpus[i].id = i;
 
-#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");
+                        irq_spinlock_initialize(&cpus[i].lock, "cpus[].lock");
 
                         for (unsigned int j = 0; j < RQ_COUNT; j++) {
@@ -104 +101 @@
         CPU->tlb_active = true;
 
-        CPU_LOCAL->idle = false;
-        CPU_LOCAL->last_cycle = get_cycle();
-        CPU->idle_cycles = ATOMIC_TIME_INITIALIZER();
-        CPU->busy_cycles = ATOMIC_TIME_INITIALIZER();
+        CPU->idle = false;
+        CPU->last_cycle = get_cycle();
+        CPU->idle_cycles = 0;
+        CPU->busy_cycles = 0;
 
         cpu_identify();