Changeset 5a4fef9 in mainline for kernel/arch/amd64/src/cpu/cpu.c

Timestamp:

2009-11-16T21:24:28Z (15 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

18baf9c0

Parents:

5f678b1c (diff), 9c70ed6 (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:

merged head changes to this branch

File:

• kernel/arch/amd64/src/cpu/cpu.c (modified) (2 diffs)

kernel/arch/amd64/src/cpu/cpu.c

@@ -130 +130 @@
         CPU->arch.vendor = VendorUnknown;
         if (has_cpuid()) {
-                cpuid(0, &info);
+                cpuid(INTEL_CPUID_LEVEL, &info);
 
                 /*
@@ -150 +150 @@
                 }
                                 
-                cpuid(1, &info);
+                cpuid(INTEL_CPUID_STANDARD, &info);
                 CPU->arch.family = (info.cpuid_eax >> 8) & 0xf;
                 CPU->arch.model = (info.cpuid_eax >> 4) & 0xf;