1 files changed, 4 insertions, 8 deletions

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 6e47e3a916f1..7b76eb67a9b3 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -300,7 +300,6 @@ static int nearby_node(int apicid)
 #ifdef CONFIG_SMP
 static void amd_get_topology(struct cpuinfo_x86 *c)
 {
-        u32 cores_per_cu = 1;
         u8 node_id;
         int cpu = smp_processor_id();
 
@@ -313,8 +312,8 @@ static void amd_get_topology(struct cpuinfo_x86 *c)
 
                 /* get compute unit information */
                 smp_num_siblings = ((ebx >> 8) & 3) + 1;
-                c->compute_unit_id = ebx & 0xff;
-                cores_per_cu += ((ebx >> 8) & 3);
+                c->x86_max_cores /= smp_num_siblings;
+                c->cpu_core_id = ebx & 0xff;
         } else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) {
                 u64 value;
 
@@ -325,19 +324,16 @@ static void amd_get_topology(struct cpuinfo_x86 *c)
 
         /* fixup multi-node processor information */
         if (nodes_per_socket > 1) {
-                u32 cores_per_node;
                 u32 cus_per_node;
 
                 set_cpu_cap(c, X86_FEATURE_AMD_DCM);
-                cores_per_node = c->x86_max_cores / nodes_per_socket;
-                cus_per_node = cores_per_node / cores_per_cu;
+                cus_per_node = c->x86_max_cores / nodes_per_socket;
 
                 /* store NodeID, use llc_shared_map to store sibling info */
                 per_cpu(cpu_llc_id, cpu) = node_id;
 
                 /* core id has to be in the [0 .. cores_per_node - 1] range */
-                c->cpu_core_id %= cores_per_node;
-                c->compute_unit_id %= cus_per_node;
+                c->cpu_core_id %= cus_per_node;
         }
 }
 #endif