From 9530027447a2f479521a7ffe7beb9bb53fa011ce Mon Sep 17 00:00:00 2001 From: Ryan Leavengood Date: Mon, 3 Jan 2011 04:10:56 +0000 Subject: [PATCH] Apply patch from augiedoggie for #6258 which adds Athlon Phenom II's to the CPU identification list. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40087 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/kernel/OS.h | 1 + headers/private/shared/cpu_type.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/headers/os/kernel/OS.h b/headers/os/kernel/OS.h index c534de9347..eb34da5cf7 100644 --- a/headers/os/kernel/OS.h +++ b/headers/os/kernel/OS.h @@ -551,6 +551,7 @@ typedef enum cpu_types { 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, diff --git a/headers/private/shared/cpu_type.h b/headers/private/shared/cpu_type.h index edae6cec7c..932b2e91bc 100644 --- a/headers/private/shared/cpu_type.h +++ b/headers/private/shared/cpu_type.h @@ -243,7 +243,6 @@ get_cpu_model_string(system_info *info) 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 @@ get_cpu_model_string(system_info *info) 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";