From: Ron Dreslinski <rdreslin@umich.edu>
Date: Wed, 11 Oct 2006 02:52:52 +0000 (-0400)
Subject: Merge zizzer:/n/wexford/x/gblack/m5/newmem_bus
X-Git-Tag: m5_2.0_beta2~104^2~14
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=477a3b0b61db26c86a390a75b2582279738dd221;p=gem5.git

Merge zizzer:/n/wexford/x/gblack/m5/newmem_bus
into  zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest

src/mem/bus.cc:
    SCCS merged

--HG--
extra : convert_revision : eaae105025635c37af06cf72bb061ce82def9dc9
---

477a3b0b61db26c86a390a75b2582279738dd221
diff --cc src/mem/bus.cc
index c475f6d8f,3b8a079ca..58652ab38
--- a/src/mem/bus.cc
+++ b/src/mem/bus.cc
@@@ -109,7 -108,7 +109,8 @@@ Bus::recvTiming(Packet *pkt
              if (pkt->flags & SATISFIED) {
                  //Cache-Cache transfer occuring
                  if (inRetry) {
 +                    DPRINTF(Bus, "Removing RETRY %i\n", retryList.front());
+                     retryList.front()->onRetryList(false);
                      retryList.pop_front();
                      inRetry = false;
                  }
@@@ -184,7 -182,7 +185,8 @@@
          // Packet was successfully sent. Return true.
          // Also take care of retries
          if (inRetry) {
 +            DPRINTF(Bus, "Remove retry from list %i\n", retryList.front());
+             retryList.front()->onRetryList(false);
              retryList.pop_front();
              inRetry = false;
          }