Skip to content

Commit 8c0fcff

Browse files
committed
Do not disable interrupts when building topology
1 parent 3aa0827 commit 8c0fcff

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

src/MacMSRDriver/PcmMsr/PcmMsr.cpp

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ asm volatile ("cpuid" : "=a" (a), "=b" (b), "=c" (c), "=d" (d) : "a" (func1), "c
1818
extern "C" {
1919
extern void mp_rendezvous_no_intrs(void (*func)(void *),
2020
void *arg);
21+
extern void mp_rendezvous(void (*setup_func)(void *),
22+
void (*action_func)(void *),
23+
void (*teardown_func)(void *),
24+
void *arg);
25+
26+
2127
extern int cpu_number(void);
2228
}
2329

@@ -180,8 +186,12 @@ IOReturn PcmMsrDriverClassName::writeMSR(pcm_msr_data_t* idata){
180186
return ret;
181187
}
182188

183-
IOReturn PcmMsrDriverClassName::buildTopology(topologyEntry* odata, uint32_t input_num_cores){
184-
mp_rendezvous_no_intrs(cpuGetTopoData, (void*)topologies);
189+
IOReturn PcmMsrDriverClassName::buildTopology(topologyEntry* odata, uint32_t input_num_cores)
190+
{
191+
mp_rendezvous(nullptr,
192+
cpuGetTopoData,
193+
nullptr,
194+
(void*)topologies);
185195
for(uint32_t i = 0; i < num_cores && i < input_num_cores; i++)
186196
{
187197
odata[i].core_id = topologies[i].core_id;

0 commit comments

Comments
 (0)