diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2023-11-15 10:15:40 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2023-11-15 10:15:40 +0100 |
| commit | 5d2d4a9f603a47403395408f64b1261ca61f6d50 (patch) | |
| tree | 52d145a53bfe4f32a20bb621ac848623ae459510 /arch/x86/events/intel | |
| parent | 33744916196b4ed7a50f6f47af7c3ad46b730ce6 (diff) | |
| parent | 889c58b3155ff4c8e8671c95daef63d6fabbb6b1 (diff) | |
Merge branch 'tip/perf/urgent'
Avoid conflicts, base on fixes.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'arch/x86/events/intel')
| -rw-r--r-- | arch/x86/events/intel/uncore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index 69043e02e8a7..01023aa5125b 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -74,7 +74,7 @@ int uncore_device_to_die(struct pci_dev *dev) struct cpuinfo_x86 *c = &cpu_data(cpu); if (c->initialized && cpu_to_node(cpu) == node) - return c->logical_die_id; + return c->topo.logical_die_id; } return -1; |