From: Gabe Black <gblack@eecs.umich.edu>
Date: Mon, 9 Oct 2006 22:19:35 +0000 (-0400)
Subject: Merge zizzer.eecs.umich.edu:/bk/newmem
X-Git-Tag: m5_2.0_beta2~104^2~20^2~4
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a23c6a719323f2ac74cadd3b04c84f3dc679c26e;p=gem5.git

Merge zizzer.eecs.umich.edu:/bk/newmem
into  zeep.eecs.umich.edu:/home/gblack/m5/newmem_bus

--HG--
extra : convert_revision : 8267487b935eaf11665841ace3a5c664751b53b0
---

a23c6a719323f2ac74cadd3b04c84f3dc679c26e
diff --cc src/mem/cache/base_cache.cc
index 02a46b444,1a0f63d17..b2c3a0439
--- a/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");