Merge ktlim@zizzer:/bk/newmem

into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem

src/cpu/o3/fetch_impl.hh:
    Hand merge.

--HG--
extra : convert_revision : 820dab2bc921cbadecaca51cd069327f984f5c74

diff --cc src/cpu/o3/fetch_impl.hh
index a430f44723fd47e2e7d0c90ba790207dadf93b58,39a13f9f8800bc80e1a3f173d57e102617665e66..4045492ca53483f5a5e195d27f3ccce42511922c
--- 1/src/cpu/o3/fetch_impl.hh
--- 2/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@@ -553,10 -550,8 +555,10 @@@ DefaultFetch<Impl>::fetchCacheLine(Add
          // Build packet here.
          PacketPtr data_pkt = new Packet(mem_req,
                                          Packet::ReadReq, Packet::Broadcast);
-         data_pkt->dataStatic(cacheData[tid]);
+         data_pkt->dataDynamic(new uint8_t[cacheBlkSize]);
  
 +        cacheDataPC[tid] = fetch_PC;
 +
          DPRINTF(Fetch, "Fetch: Doing instruction read.\n");
  
          fetchedCacheLines++;