Compose the AMD family and model IDs according to the AMD CPUID manual, section 2

xtoskrnl/ar/amd64/procsup.c

@@ -167,9 +167,9 @@ ArpIdentifyProcessor(VOID)
     if(Prcb->CpuId.Vendor == CPU_VENDOR_AMD)
     {
         /* AMD CPU */
-        Prcb->CpuId.Family = Prcb->CpuId.Family + CpuSignature.ExtendedFamily;
-        if(Prcb->CpuId.Model == 0xF)
+        if(Prcb->CpuId.Family >= 0xF)
         {
+            Prcb->CpuId.Family = Prcb->CpuId.Family + CpuSignature.ExtendedFamily;
             Prcb->CpuId.Model = Prcb->CpuId.Model + (CpuSignature.ExtendedModel << 4);
         }
     }
@@ -181,7 +181,7 @@ ArpIdentifyProcessor(VOID)
             Prcb->CpuId.Family = Prcb->CpuId.Family + CpuSignature.ExtendedFamily;
         }
 
-        if((Prcb->CpuId.Family == 0xF) || (Prcb->CpuId.Family == 0x6))
+        if((Prcb->CpuId.Family == 0x6) || (Prcb->CpuId.Family == 0xF))
         {
             Prcb->CpuId.Model = Prcb->CpuId.Model + (CpuSignature.ExtendedModel << 4);
         }