Merge Gabe's changes from head.

[gem5.git] / src / mem / bus.cc

diff --git a/src/mem/bus.cc b/src/mem/bus.cc
index 518c9dbfa2f25b2f7e9a776a5fb680d443f87876..cb359734b515d3422ba6f9038649d9be3bc3440d 100644 (file)
--- a/src/mem/bus.cc
+++ b/src/mem/bus.cc
@@ -180,7 +180,7 @@ Bus::recvTiming(PacketPtr pkt)
 
     // If the bus is busy, or other devices are in line ahead of the current
     // one, put this device on the retry list.
-    if (!(pkt->isResponse() || pkt->isExpressSnoop()) &&
+    if (!pkt->isExpressSnoop() &&
         (tickNextIdle > curTick ||
          (retryList.size() && (!inRetry || src_port != retryList.front()))))
     {
@@ -189,7 +189,9 @@ Bus::recvTiming(PacketPtr pkt)
         return false;
     }
 
-    occupyBus(pkt);
+    if (!pkt->isExpressSnoop()) {
+        occupyBus(pkt);
+    }
 
     short dest = pkt->getDest();
     int dest_port_id;