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:31 +0200
committerGravatar Thomas Gleixner <tglx@linutronix.de> 2023-10-10 14:38:17 +0200
commit8a169ed40fcf6e0e7a2d900c7ab4408649488f40 (patch)
tree600357df8d8a111023ef89ead6097ee60afc79c0 /arch/x86/include/asm/processor.h
parentx86/cpu: Move phys_proc_id into topology info (diff)
downloadlinux-8a169ed40fcf6e0e7a2d900c7ab4408649488f40.tar.gz
linux-8a169ed40fcf6e0e7a2d900c7ab4408649488f40.tar.bz2
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/include/asm/processor.h')
-rw-r--r--arch/x86/include/asm/processor.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index a673199aaa45..662e9736c3d0 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -86,6 +86,9 @@ struct cpuinfo_topology {
// Physical package ID
u32 pkg_id;
+
+ // Physical die ID on AMD, Relative on Intel
+ u32 die_id;
};
struct cpuinfo_x86 {
@@ -141,7 +144,6 @@ struct cpuinfo_x86 {
u16 logical_proc_id;
/* Core id: */
u16 cpu_core_id;
- u16 cpu_die_id;
u16 logical_die_id;
/* Index into per_cpu list: */
u16 cpu_index;