6 files changed, 0 insertions, 6 deletions

diff --git a/src/cpu/kvm/base.cc b/src/cpu/kvm/base.cc
index 77cf277a6..0b3888976 100644
--- a/src/cpu/kvm/base.cc
+++ b/src/cpu/kvm/base.cc
@@ -689,7 +689,6 @@ BaseKvmCPU::tick()
           // have exited in time for the event using the instruction
           // counter configured by setupInstStop().
           comInstEventQueue[0]->serviceEvents(ctrInsts);
-          system->instEventQueue.serviceEvents(system->totalNumInsts);
 
           if (tryDrain())
               _status = Idle;
diff --git a/src/cpu/minor/execute.cc b/src/cpu/minor/execute.cc
index c7fda489e..dc7986616 100644
--- a/src/cpu/minor/execute.cc
+++ b/src/cpu/minor/execute.cc
@@ -871,7 +871,6 @@ Execute::doInstCommitAccounting(MinorDynInstPtr inst)
 
         /* Act on events related to instruction counts */
         cpu.comInstEventQueue[inst->id.threadId]->serviceEvents(thread->numInst);
-        cpu.system->instEventQueue.serviceEvents(cpu.system->totalNumInsts);
     }
     thread->numOp++;
     thread->numOps++;
diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc
index 1353c1ed4..5871e6584 100644
--- a/src/cpu/o3/cpu.cc
+++ b/src/cpu/o3/cpu.cc
@@ -1522,7 +1522,6 @@ FullO3CPU<Impl>::instDone(ThreadID tid, const DynInstPtr &inst)
 
         // Check for instruction-count-based events.
         comInstEventQueue[tid]->serviceEvents(thread[tid]->numInst);
-        system->instEventQueue.serviceEvents(system->totalNumInsts);
     }
     thread[tid]->numOp++;
     thread[tid]->numOps++;
diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index 816add707..b93ae0912 100644
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -500,7 +500,6 @@ BaseSimpleCPU::preExecute()
 
     // check for instruction-count-based events
     comInstEventQueue[curThread]->serviceEvents(t_info.numInst);
-    system->instEventQueue.serviceEvents(system->totalNumInsts);
 
     // decode the instruction
     inst = gtoh(inst);
diff --git a/src/sim/system.cc b/src/sim/system.cc
index 87a220311..3868f57b8 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -112,7 +112,6 @@ System::System(Params *p)
       thermalModel(p->thermal_model),
       _params(p),
       totalNumInsts(0),
-      instEventQueue("system instruction-based event queue"),
       redirectPaths(p->redirect_paths)
 {
 
diff --git a/src/sim/system.hh b/src/sim/system.hh
index 345d83c2a..852bc21a2 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -605,7 +605,6 @@ class System : public SimObject
 
   public:
     Counter totalNumInsts;
-    EventQueue instEventQueue;
     std::map<std::pair<uint32_t,uint32_t>, Tick>  lastWorkItemStarted;
     std::map<uint32_t, Stats::Histogram*> workItemStats;