Changeset cefb126 in mainline for kernel/generic/src/sysinfo/stats.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/sysinfo/stats.c (modified) (1 diff)

kernel/generic/src/sysinfo/stats.c

@@ -124 +124 @@
                 stats_cpus[i].active = cpus[i].active;
                 stats_cpus[i].frequency_mhz = cpus[i].frequency_mhz;
-                stats_cpus[i].busy_ticks = cpus[i].busy_ticks;
-                stats_cpus[i].idle_ticks = cpus[i].idle_ticks;
+                stats_cpus[i].busy_cycles = cpus[i].busy_cycles;
+                stats_cpus[i].idle_cycles = cpus[i].idle_cycles;
                 
                 irq_spinlock_unlock(&cpus[i].lock, true);