Changeset 88dea9d in mainline for kernel/generic/src/cpu/cpu.c

Timestamp:

2010-04-17T16:28:49Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

30a5470

Parents:

5ba201d (diff), 95319bd (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 from measuring branch

File:

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

kernel/generic/src/cpu/cpu.c

@@ -48 +48 @@
 #include <adt/list.h>
 #include <print.h>
+#include <sysinfo/sysinfo.h>
 
 cpu_t *cpus;
@@ -74 +75 @@
                         
                         cpus[i].id = i;
+                        cpus[i].idle_ticks = 0;
+                        cpus[i].busy_ticks = 0;
                         
                         spinlock_initialize(&cpus[i].lock, "cpu_t.lock");
@@ -94 +97 @@
         cpu_identify();
         cpu_arch_init();
+
+        sysinfo_set_item_val("cpu.count", NULL, config.cpu_count);
 }