Sync with trunk r43123
[reactos.git] / reactos / ntoskrnl / config / i386 / cmhardwr.c
index 039a897..123aaf7 100644 (file)
@@ -238,7 +238,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc
     HANDLE KeyHandle, BiosHandle, SystemHandle, FpuHandle, SectionHandle;
     CONFIGURATION_COMPONENT_DATA ConfigData;
     CHAR Buffer[128];
-    ULONG ExtendedId, Dummy;
+    ULONG ExtendedId, CpuInfo[4];
     PKPRCB Prcb;
     USHORT IndexTable[MaximumType + 1] = {0};
     ANSI_STRING TempString;
@@ -428,19 +428,17 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc
                 else
                 {
                     /* Check if we have extended CPUID that supports name ID */
-                    Ki386Cpuid(0x80000000, &ExtendedId, &Dummy, &Dummy, &Dummy);
+                    CPUID(CpuInfo, 0x80000000);
+                    ExtendedId = CpuInfo[0];
                     if (ExtendedId >= 0x80000004)
                     {
-                        /* Do all the CPUIDs requred to get the full name */
+                        /* Do all the CPUIDs required to get the full name */
                         PartialString = CpuString;
                         for (ExtendedId = 2; ExtendedId <= 4; ExtendedId++)
                         {
                             /* Do the CPUID and save the name string */
-                            Ki386Cpuid(0x80000000 | ExtendedId,
-                                       (PULONG)PartialString,
-                                       (PULONG)PartialString + 1,
-                                       (PULONG)PartialString + 2,
-                                       (PULONG)PartialString + 3);
+                            CPUID((PULONG)PartialString,
+                                  0x80000000 | ExtendedId);
 
                             /* Go to the next name string */
                             PartialString += 16;