1 files changed, 3 insertions, 6 deletions

diff --git a/src/cpu/inorder/resources/agen_unit.cc b/src/cpu/inorder/resources/agen_unit.cc
index 2de586c82..f1862b94a 100644
--- a/src/cpu/inorder/resources/agen_unit.cc
+++ b/src/cpu/inorder/resources/agen_unit.cc
@@ -52,14 +52,11 @@ AGENUnit::execute(int slot_num)
 {
     ResourceRequest* agen_req = reqMap[slot_num];
     DynInstPtr inst = reqMap[slot_num]->inst;
-    Fault fault = reqMap[slot_num]->fault;
 #if TRACING_ON
     ThreadID tid = inst->readTid();
 #endif
     int seq_num = inst->seqNum;
 
-    agen_req->fault = NoFault;
-
     switch (agen_req->cmd)
     {
       case GenerateAddr:
@@ -70,18 +67,18 @@ AGENUnit::execute(int slot_num)
                         "[tid:%i] Generating Address for [sn:%i] (%s).\n",
                         tid, seq_num, inst->staticInst->getName());
 
-                fault = inst->calcEA();
+                inst->fault = inst->calcEA();
                 inst->setMemAddr(inst->getEA());
 
                 DPRINTF(InOrderAGEN,
                     "[tid:%i] [sn:%i] Effective address calculated as: %#x\n",
                     tid, seq_num, inst->getEA());
 
-                if (fault == NoFault) {
+                if (inst->fault == NoFault) {
                     agen_req->done();
                 } else {
                     fatal("%s encountered while calculating address [sn:%i]",
-                          fault->name(), seq_num);
+                          inst->fault->name(), seq_num);
                 }
 
                 agens++;