Merge zizzer.eecs.umich.edu:/bk/newmem

into  zeep.eecs.umich.edu:/home/gblack/m5/newmem_bus

--HG--
extra : convert_revision : 8267487b935eaf11665841ace3a5c664751b53b0

diff --cc src/mem/bus.cc
Simple merge

diff --cc src/mem/bus.hh
Simple merge

diff --cc src/mem/cache/base_cache.cc
index 02a46b4445493d0e0a1caa4adc0871e5a97d7288,1a0f63d174024f99c74946f3f2085b00043dfc43..b2c3a04392d8106519d70637f13f1f6df8103d62
--- 1/src/mem/cache/base_cache.cc
--- 2/src/mem/cache/base_cache.cc
+++ b/src/mem/cache/base_cache.cc
@@@ -105,9 -105,11 +105,10 @@@ BaseCache::CachePort::recvRetry(
                  drainList.pop_front();
          }
      }
 -
 -    if (!isCpuSide)
 +    else if (!isCpuSide)
      {
          pkt = cache->getPacket();
+         MSHR* mshr = (MSHR*)pkt->senderState;
          bool success = sendTiming(pkt);
          DPRINTF(Cache, "Address %x was %s in sending the timing request\n",
                  pkt->getAddr(), success ? "succesful" : "unsuccesful");