aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/topology.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2023-08-14 10:18:31 +0200
committerThomas Gleixner <tglx@linutronix.de>2023-10-10 14:38:17 +0200
commit8a169ed40fcf6e0e7a2d900c7ab4408649488f40 (patch)
tree600357df8d8a111023ef89ead6097ee60afc79c0 /arch/x86/kernel/cpu/topology.c
parentx86/cpu: Move phys_proc_id into topology info (diff)
downloadlinux-8a169ed40fcf6e0e7a2d900c7ab4408649488f40.tar.gz
linux-8a169ed40fcf6e0e7a2d900c7ab4408649488f40.zip
x86/cpu: Move cpu_die_id into topology info
Move the next member. No functional change. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Tested-by: Juergen Gross <jgross@suse.com> Tested-by: Sohil Mehta <sohil.mehta@intel.com> Tested-by: Michael Kelley <mikelley@microsoft.com> Tested-by: Peter Zijlstra (Intel) <peterz@infradead.org> Tested-by: Zhang Rui <rui.zhang@intel.com> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lore.kernel.org/r/20230814085112.388185134@linutronix.de
Diffstat (limited to 'arch/x86/kernel/cpu/topology.c')
-rw-r--r--arch/x86/kernel/cpu/topology.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/topology.c b/arch/x86/kernel/cpu/topology.c
index 0da4755e62c1..3b48bc324dfd 100644
--- a/arch/x86/kernel/cpu/topology.c
+++ b/arch/x86/kernel/cpu/topology.c
@@ -150,7 +150,7 @@ int detect_extended_topology(struct cpuinfo_x86 *c)
ht_mask_width) & core_select_mask;
if (die_level_present) {
- c->cpu_die_id = apic->phys_pkg_id(c->topo.initial_apicid,
+ c->topo.die_id = apic->phys_pkg_id(c->topo.initial_apicid,
core_plus_mask_width) & die_select_mask;
}