diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2006-10-10 01:57:57 -0400 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2006-10-10 01:57:57 -0400 |
| commit | a0472af008bd13d8a4850ef67b0ef08d37cfb8f8 (patch) | |
| tree | 79e12834910a62d400002736c6d306e0e4b8faed /src/mem/cache/miss/mshr_queue.cc | |
| parent | 5448517da4cd13e3c8438850f04367d9614d686b (diff) | |
| parent | cc78d86661dfccaca2f144d5bdcc75761bf52521 (diff) | |
| download | gem5-a0472af008bd13d8a4850ef67b0ef08d37cfb8f8.tar.xz | |
Merge zizzer:/z/m5/Bitkeeper/newmem
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest
src/mem/packet.hh:
Hand merge code
--HG--
extra : convert_revision : d659418f24f4f4bf9867fec8573a5d227c0dfcea
Diffstat (limited to 'src/mem/cache/miss/mshr_queue.cc')
| -rw-r--r-- | src/mem/cache/miss/mshr_queue.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mem/cache/miss/mshr_queue.cc b/src/mem/cache/miss/mshr_queue.cc index bd9667529..78897c8fb 100644 --- a/src/mem/cache/miss/mshr_queue.cc +++ b/src/mem/cache/miss/mshr_queue.cc @@ -213,7 +213,7 @@ void MSHRQueue::markInService(MSHR* mshr) { //assert(mshr == pendingList.front()); - if (!mshr->pkt->needsResponse()) { + if (!(mshr->pkt->needsResponse() || mshr->pkt->cmd == Packet::UpgradeReq)) { assert(mshr->getNumTargets() == 0); deallocate(mshr); return; |