aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/processor.h
diff options
context:
space:
mode:
authorGravatar Thomas Gleixner <tglx@linutronix.de> 2023-08-14 10:18:37 +0200
committerGravatar Thomas Gleixner <tglx@linutronix.de> 2023-10-10 14:38:18 +0200
commit22dc9631625352426cd665f4e3f8fe0d793b2bf5 (patch)
tree3ecc85fe714f3996c51962d14dea850394a7b1d9 /arch/x86/include/asm/processor.h
parentx86/cpu: Remove pointless evaluation of x86_coreid_bits (diff)
downloadlinux-22dc9631625352426cd665f4e3f8fe0d793b2bf5.tar.gz
linux-22dc9631625352426cd665f4e3f8fe0d793b2bf5.tar.bz2
linux-22dc9631625352426cd665f4e3f8fe0d793b2bf5.zip
x86/cpu: Move logical package and die IDs into topology info
Yet another topology related data pair. Rename logical_proc_id to logical_pkg_id so it fits the common naming conventions. 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.745139505@linutronix.de
Diffstat (limited to 'arch/x86/include/asm/processor.h')
-rw-r--r--arch/x86/include/asm/processor.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 517d0bc319e4..b2cf309eed99 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -95,6 +95,10 @@ struct cpuinfo_topology {
// Core ID relative to the package
u32 core_id;
+
+ // Logical ID mappings
+ u32 logical_pkg_id;
+ u32 logical_die_id;
};
struct cpuinfo_x86 {
@@ -145,10 +149,6 @@ struct cpuinfo_x86 {
u16 x86_clflush_size;
/* number of cores as seen by the OS: */
u16 booted_cores;
- /* Logical processor id: */
- u16 logical_proc_id;
- /* Core id: */
- u16 logical_die_id;
/* Index into per_cpu list: */
u16 cpu_index;
/* Is SMT active on this core? */