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

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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/src/cpu/cpu.c (modified) (2 diffs)

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

@@ -92 +92 @@
 void cpu_arch_init(void)
 {
-        cpuid_extended_feature_info efi;
         cpu_info_t info;
         uint32_t help = 0;
@@ -104 +103 @@
         
         CPU->arch.fi.word = info.cpuid_edx;
-        efi.word = info.cpuid_ecx;
         
         if (CPU->arch.fi.bits.fxsr)