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

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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/cpu.h (modified) (2 diffs)

kernel/generic/include/cpu.h

@@ -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;