Merge vm1.(none):/home/stever/bk/newmem-head

into  vm1.(none):/home/stever/bk/newmem-cache2

src/mem/cache/base_cache.hh:
    Manual conflict resolution.

--HG--
extra : convert_revision : 5ebfd7abb4f978caa88bf43d25935869edfc6b9f

diff --cc src/cpu/memtest/memtest.hh
Simple merge

diff --cc src/mem/bridge.cc
Simple merge

diff --cc src/mem/bus.cc
Simple merge

diff --cc src/mem/cache/base_cache.cc
index b699271f7c5d625d05229fc10d9464998496004e,8aac024604104ab82295c0026c4fb03d5cabb225..d75d35ebb47aa9c3a4ba198ab93a3a6ffef55746
--- 1/src/mem/cache/base_cache.cc
--- 2/src/mem/cache/base_cache.cc
+++ b/src/mem/cache/base_cache.cc
@@@ -67,11 -59,9 +67,10 @@@ BaseCache::CachePort::recvStatusChange(
  }
  
  void
- BaseCache::CachePort::getDeviceAddressRanges(AddrRangeList &resp,
-                                        AddrRangeList &snoop)
+ BaseCache::CachePort::getDeviceAddressRanges(AddrRangeList &resp, bool &snoop)
  {
 -    cache->getAddressRanges(resp, snoop, isCpuSide);
 +    AddrRangeList dummy;
 +    otherPort->getPeerAddressRanges(resp, dummy);
  }
  
  int

diff --cc src/mem/cache/base_cache.hh
Simple merge