We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 0925367 commit 94f0b39Copy full SHA for 94f0b39
drivers/hwmon/fam15h_power.c
@@ -17,6 +17,7 @@
17
#include <linux/cpumask.h>
18
#include <linux/time.h>
19
#include <linux/sched.h>
20
+#include <linux/topology.h>
21
#include <asm/processor.h>
22
#include <asm/msr.h>
23
@@ -134,15 +135,13 @@ static DEVICE_ATTR_RO(power1_crit);
134
135
static void do_read_registers_on_cu(void *_data)
136
{
137
struct fam15h_power_data *data = _data;
- int cpu, cu;
138
-
139
- cpu = smp_processor_id();
+ int cu;
140
141
/*
142
* With the new x86 topology modelling, cpu core id actually
143
* is compute unit id.
144
*/
145
- cu = cpu_data(cpu).cpu_core_id;
+ cu = topology_core_id(smp_processor_id());
146
147
rdmsrl_safe(MSR_F15H_CU_PWR_ACCUMULATOR, &data->cu_acc_power[cu]);
148
rdmsrl_safe(MSR_F15H_PTSC, &data->cpu_sw_pwr_ptsc[cu]);
0 commit comments