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/include/asm/processor.h | |
| parent | hwmon: (fam15h_power) Use topology_core_id() (diff) | |
| download | linux-e95256335d45cc965cd12c423535002974313340.tar.gz linux-e95256335d45cc965cd12c423535002974313340.tar.bz2 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/include/asm/processor.h')
| -rw-r--r-- | arch/x86/include/asm/processor.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 662e9736c3d0..a63760284cba 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -89,6 +89,9 @@ struct cpuinfo_topology { // Physical die ID on AMD, Relative on Intel u32 die_id; + + // Core ID relative to the package + u32 core_id; }; struct cpuinfo_x86 { @@ -143,7 +146,6 @@ struct cpuinfo_x86 { /* Logical processor id: */ u16 logical_proc_id; /* Core id: */ - u16 cpu_core_id; u16 logical_die_id; /* Index into per_cpu list: */ u16 cpu_index; |