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

diff --cc src/mem/bus.cc
index c475f6d8f7f6d903a57fb116f276f6e704f79771,3b8a079caaa4637d8779636b3a7cff179b91f52e..58652ab38c46540185d4cf68b6f4d90c3647e8b5
--- 1/src/mem/bus.cc
--- 2/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;
          }