Changeset 985e26d2 in mainline for kernel/arch/ia32/include/cpu.h

Timestamp:

2010-01-07T19:06:59Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8190e63

Parents:

743e17b (diff), eca2435 (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/arch/ia32/include/cpu.h (modified) (2 diffs)

kernel/arch/ia32/include/cpu.h

@@ -50 +50 @@
 #include <arch/pm.h>
 #include <arch/asm.h>
+#include <arch/cpuid.h>
 
 typedef struct {
@@ -56 +57 @@
         unsigned int model;
         unsigned int stepping;
+        cpuid_feature_info fi;
+
         tss_t *tss;