Automated merge with file:/home/stever/hg/m5-orig

--HG--
extra : convert_revision : 86a55cd98a9704f756a70aa0cbd2820cf92c821d

1 files changed, 5 insertions, 4 deletions

diff --git a/src/mem/bus.cc b/src/mem/bus.cc
index cfddfff12..f47d48d0b 100644
--- a/src/mem/bus.cc
+++ b/src/mem/bus.cc
@@ -105,7 +105,7 @@ void Bus::BusFreeEvent::process()
     bus->recvRetry(-1);
 }
 
-const char * Bus::BusFreeEvent::description()
+const char * Bus::BusFreeEvent::description() const
 {
     return "bus became available";
 }
@@ -307,9 +307,10 @@ Bus::findPort(Addr addr)
     dest_id = checkPortCache(addr);
     if (dest_id == -1) {
         PortIter i = portMap.find(RangeSize(addr,1));
-        if (i != portMap.end())
-          dest_id = i->second;
-        updatePortCache(dest_id, i->first.start, i->first.end);
+        if (i != portMap.end()) {
+            dest_id = i->second;
+            updatePortCache(dest_id, i->first.start, i->first.end);
+        }
     }
 
     // Check if this matches the default range