diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2006-10-11 01:02:18 -0400 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2006-10-11 01:02:18 -0400 |
| commit | 4e35c5656f02c5158fab8082607a000dd85e053c (patch) | |
| tree | 830186021002d07ef92282b7e80fc4b2c8ae319f /src | |
| parent | c2012601e94126cd55fa593088b4a25f20cfc2a2 (diff) | |
| parent | 7767f5af734bdab41da5e81b8d432223b955ba34 (diff) | |
| download | gem5-4e35c5656f02c5158fab8082607a000dd85e053c.tar.xz | |
Merge zizzer:/n/wexford/x/gblack/m5/newmem_bus
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest
--HG--
extra : convert_revision : 70187b8f04d0f8424512f64bdade05bf1aca85a3
Diffstat (limited to 'src')
| -rw-r--r-- | src/mem/bus.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mem/bus.cc b/src/mem/bus.cc index 6065ee1f1..3998666c7 100644 --- a/src/mem/bus.cc +++ b/src/mem/bus.cc @@ -206,8 +206,8 @@ void Bus::recvRetry(int id) { DPRINTF(Bus, "Received a retry\n"); - // If there's anything waiting... - if (retryList.size()) { + // If there's anything waiting, and the bus isn't busy... + if (retryList.size() && curTick >= tickNextIdle) { //retryingPort = retryList.front(); inRetry = true; DPRINTF(Bus, "Sending a retry\n"); |