Changeset cefb126 in mainline for kernel/generic/include/sysinfo/abi.h

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/include/sysinfo/abi.h (modified) (1 diff)

kernel/generic/include/sysinfo/abi.h

@@ -69 +69 @@
         bool active;             /**< CPU is activate */
         uint16_t frequency_mhz;  /**< Frequency in MHz */
-        uint64_t idle_ticks;     /**< Number of idle kernel quanta */
-        uint64_t busy_ticks;     /**< Number of busy kernel quanta */
+        uint64_t idle_cycles;    /**< Number of idle cycles */
+        uint64_t busy_cycles;    /**< Number of busy cycles */
 } stats_cpu_t;