From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Tue, 22 May 2007 13:36:01 +0000 (-0700)
Subject: Merge vm1.(none):/home/stever/bk/newmem-head
X-Git-Tag: m5_2.0_beta4~195^2~50^2~43^2~9
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0484867d85da6c1f97c5e1c55056cf48b6b7c37d;p=gem5.git

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
---

0484867d85da6c1f97c5e1c55056cf48b6b7c37d
diff --cc src/mem/cache/base_cache.cc
index b699271f7,8aac02460..d75d35ebb
--- a/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