diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2023-08-14 10:18:34 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2023-10-10 14:38:17 +0200 |
| commit | e95256335d45cc965cd12c423535002974313340 (patch) | |
| tree | f7b319cd8d4242c3c680c633141d0bfd1f18da7d /arch/x86/kernel/cpu/topology.c | |
| parent | hwmon: (fam15h_power) Use topology_core_id() (diff) | |
| download | linux-e95256335d45cc965cd12c423535002974313340.tar.gz linux-e95256335d45cc965cd12c423535002974313340.zip | |
x86/cpu: Move cpu_core_id into topology info
Rename it to core_id and stick it to the other ID fields.
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.566519388@linutronix.de
Diffstat (limited to 'arch/x86/kernel/cpu/topology.c')
| -rw-r--r-- | arch/x86/kernel/cpu/topology.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/topology.c b/arch/x86/kernel/cpu/topology.c index 3b48bc324dfd..dc136703566f 100644 --- a/arch/x86/kernel/cpu/topology.c +++ b/arch/x86/kernel/cpu/topology.c @@ -146,7 +146,7 @@ int detect_extended_topology(struct cpuinfo_x86 *c) die_select_mask = (~(-1 << die_plus_mask_width)) >> core_plus_mask_width; - c->cpu_core_id = apic->phys_pkg_id(c->topo.initial_apicid, + c->topo.core_id = apic->phys_pkg_id(c->topo.initial_apicid, ht_mask_width) & core_select_mask; if (die_level_present) { |