Changeset db71e2a in mainline for kernel/arch/ia32/src/cpu/cpu.c

Timestamp:

2013-07-24T17:42:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• kernel/arch/ia32/src/cpu/cpu.c (modified) (1 diff)

kernel/arch/ia32/src/cpu/cpu.c

@@ -115 +115 @@
                         "mov %[help], %%cr4\n"
                         : [help] "+r" (help)
-                        : [mask] "i" (CR4_OSFXSR_MASK | (1 << 10))
+                        : [mask] "i" (CR4_OSFXSR_MASK | CR4_OSXMMEXCPT_MASK)
                 );
         }
-
+        
 #ifndef PROCESSOR_i486
         if (CPU->arch.fi.bits.sep) {