Changeset c47e1a8 in mainline for kernel/generic/include/cpu.h

Timestamp:

2010-05-21T07:50:04Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

• kernel/generic/include/cpu.h (modified) (3 diffs)

kernel/generic/include/cpu.h

@@ -48 +48 @@
  * There is one structure like this for every processor.
  */
-typedef struct {
+typedef struct cpu {
         SPINLOCK_DECLARE(lock);
 
@@ -68 +68 @@
                                              are disabled. */
 
+        bool idle;
+        uint64_t idle_ticks;
+        uint64_t busy_ticks;
+
         /**
          * Processor ID assigned by kernel.
@@ -73 +77 @@
         unsigned int id;
         
-        int active;
+        bool active;
         int tlb_active;