866,867c866,867
< void armMonitor(Addr address) { cpu->armMonitor(address); }
< bool mwait(PacketPtr pkt) { return cpu->mwait(pkt); }
---
> void armMonitor(Addr address) { cpu->armMonitor(threadNumber, address); }
> bool mwait(PacketPtr pkt) { return cpu->mwait(threadNumber, pkt); }
869,870c869,871
< { return cpu->mwaitAtomic(tc, cpu->dtb); }
< AddressMonitor *getAddrMonitor() { return cpu->getCpuAddrMonitor(); }
---
> { return cpu->mwaitAtomic(threadNumber, tc, cpu->dtb); }
> AddressMonitor *getAddrMonitor()
> { return cpu->getCpuAddrMonitor(threadNumber); }