Changeset 533e2d7 in mainline for kernel/arch/ia32/include/arch/cpu.h

Timestamp:

2013-06-03T07:55:35Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

797d4d19

Parents:

ea15a89a (diff), 6db5d4b (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/arch/cpu.h (modified) (2 diffs)

kernel/arch/ia32/include/arch/cpu.h

@@ -41 +41 @@
 #define EFLAGS_RF       (1 << 16)
 
-#define CR4_OSFXSR_MASK (1<<9)
+#define CR4_OSFXSR_MASK      (1 << 9)
+#define CR4_OSXMMEXCPT_MASK  (1 << 10)
 
 /* Support for SYSENTER and SYSEXIT */
@@ -59 +60 @@
         unsigned int model;
         unsigned int stepping;
-        cpuid_feature_info fi;
-
+        cpuid_feature_info_t fi;
+        
         tss_t *tss;