diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-10-08 19:14:09 -0400 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-10-08 19:14:09 -0400 |
| commit | 2df9053bb0c158ae40f810b63be8ed0066465012 (patch) | |
| tree | 3ee8e0399cb8074e788074c3dab3e59decd61c6b /src/mem/cache | |
| parent | e65f0cef3ca70edf37ff74920def4ac899f6c7e3 (diff) | |
| parent | 0c574f10695002827b42f750cef16fe4e6118c2b (diff) | |
| download | gem5-2df9053bb0c158ae40f810b63be8ed0066465012.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into zeep.eecs.umich.edu:/home/gblack/m5/newmem_bus
src/mem/bus.cc:
Hand merged. Needs to be fixed
--HG--
extra : convert_revision : df03219ccfd18431cc726a063bd29d30554944a1
Diffstat (limited to 'src/mem/cache')
| -rw-r--r-- | src/mem/cache/base_cache.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mem/cache/base_cache.cc b/src/mem/cache/base_cache.cc index d7ccca8c0..02a46b444 100644 --- a/src/mem/cache/base_cache.cc +++ b/src/mem/cache/base_cache.cc @@ -105,8 +105,7 @@ BaseCache::CachePort::recvRetry() drainList.pop_front(); } } - - if (!isCpuSide) + else if (!isCpuSide) { pkt = cache->getPacket(); bool success = sendTiming(pkt); |