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

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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.

Message:

Merge mainline changes.

File:

• kernel/generic/src/cpu/cpu.c (modified) (3 diffs)

kernel/generic/src/cpu/cpu.c

@@ -49 +49 @@
 #include <print.h>
 #include <sysinfo/sysinfo.h>
+#include <arch/cycle.h>
 
 cpu_t *cpus;
@@ -94 +95 @@
         CPU->tlb_active = true;
         
+        CPU->idle = false;
+        CPU->last_cycle = get_cycle();
+        CPU->idle_cycles = 0;
+        CPU->busy_cycles = 0;
+        
         cpu_identify();
         cpu_arch_init();
@@ -113 +119 @@
 /** @}
  */
-