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

Timestamp:

2009-11-28T16:30:43Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c4702804

Parents:

ba8f8cb (diff), 67392fa (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) (5 diffs)

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

@@ -92 +92 @@
 void cpu_arch_init(void)
 {
-        cpuid_feature_info fi;
         cpuid_extended_feature_info efi;
         cpu_info_t info;
@@ -102 +101 @@
         CPU->fpu_owner = NULL;
         
-        cpuid(1, &info);
+        cpuid(INTEL_CPUID_STANDARD, &info);
         
-        fi.word = info.cpuid_edx;
+        CPU->arch.fi.word = info.cpuid_edx;
         efi.word = info.cpuid_ecx;
         
-        if (fi.bits.fxsr)
+        if (CPU->arch.fi.bits.fxsr)
                 fpu_fxsr();
         else
                 fpu_fsr();
         
-        if (fi.bits.sse) {
+        if (CPU->arch.fi.bits.sse) {
                 asm volatile (
                         "mov %%cr4, %[help]\n"
@@ -122 +121 @@
         }
         
-        /* Setup fast SYSENTER/SYSEXIT syscalls */
-        syscall_setup_cpu();
+        if (CPU->arch.fi.bits.sep) {
+                /* Setup fast SYSENTER/SYSEXIT syscalls */
+                syscall_setup_cpu();
+        }
 }
 
@@ -132 +133 @@
         CPU->arch.vendor = VendorUnknown;
         if (has_cpuid()) {
-                cpuid(0, &info);
+                cpuid(INTEL_CPUID_LEVEL, &info);
 
                 /*
@@ -150 +151 @@
                         CPU->arch.vendor = VendorIntel;
                 
-                cpuid(1, &info);
+                cpuid(INTEL_CPUID_STANDARD, &info);
                 CPU->arch.family = (info.cpuid_eax >> 8) & 0x0f;
                 CPU->arch.model = (info.cpuid_eax >> 4) & 0x0f;