[haiku-commits] r40087 - in haiku/trunk/headers: os/kernel private/shared
- From: leavengood@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 3 Jan 2011 05:10:56 +0100 (CET)
Author: leavengood
Date: 2011-01-03 05:10:56 +0100 (Mon, 03 Jan 2011)
New Revision: 40087
Changeset: http://dev.haiku-os.org/changeset/40087
Ticket: http://dev.haiku-os.org/ticket/6258
Modified:
haiku/trunk/headers/os/kernel/OS.h
haiku/trunk/headers/private/shared/cpu_type.h
Log:
Apply patch from augiedoggie for #6258 which adds Athlon Phenom II's to the CPU
identification list.
Modified: haiku/trunk/headers/os/kernel/OS.h
===================================================================
--- haiku/trunk/headers/os/kernel/OS.h 2011-01-03 03:51:25 UTC (rev 40086)
+++ haiku/trunk/headers/os/kernel/OS.h 2011-01-03 04:10:56 UTC (rev 40087)
@@ -551,6 +551,7 @@
B_CPU_AMD_ATHLON_64_MODEL_3 = 0x11f3,
B_CPU_AMD_ATHLON_64_MODEL_4,
B_CPU_AMD_ATHLON_64_MODEL_5,
+ B_CPU_AMD_PHENOM_II =
B_CPU_AMD_ATHLON_64_MODEL_4,
B_CPU_AMD_OPTERON =
B_CPU_AMD_ATHLON_64_MODEL_5,
B_CPU_AMD_ATHLON_64_FX =
B_CPU_AMD_ATHLON_64_MODEL_5,
B_CPU_AMD_ATHLON_64_MODEL_7 = 0x11f7,
Modified: haiku/trunk/headers/private/shared/cpu_type.h
===================================================================
--- haiku/trunk/headers/private/shared/cpu_type.h 2011-01-03 03:51:25 UTC
(rev 40086)
+++ haiku/trunk/headers/private/shared/cpu_type.h 2011-01-03 04:10:56 UTC
(rev 40087)
@@ -243,7 +243,6 @@
case B_CPU_AMD_ATHLON_XP_MODEL_7:
return "Duron";
case B_CPU_AMD_ATHLON_64_MODEL_3:
- case B_CPU_AMD_ATHLON_64_MODEL_4:
case B_CPU_AMD_ATHLON_64_MODEL_7:
case B_CPU_AMD_ATHLON_64_MODEL_8:
case B_CPU_AMD_ATHLON_64_MODEL_11:
@@ -255,6 +254,8 @@
return "Opteron";
case B_CPU_AMD_PHENOM:
return "Phenom";
+ case B_CPU_AMD_PHENOM_II:
+ return "Phenom II";
case B_CPU_AMD_GEODE_LX:
return "Geode LX";
Other related posts:
- » [haiku-commits] r40087 - in haiku/trunk/headers: os/kernel private/shared - leavengood
