summaryrefslogtreecommitdiff
path: root/src/mem/cache
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2007-02-07 10:55:14 -0800
committerSteve Reinhardt <stever@eecs.umich.edu>2007-02-07 10:55:14 -0800
commit6b37bb67101803f12b6ed2bef714af583d03f814 (patch)
treefd09b9cd98d9ac317f84ac424410813c8755c3dc /src/mem/cache
parent997fc505a8b2ed843f2c87bd2371e6510f731324 (diff)
parenta19e9ea5fca3567bdf9d780b4e7669507daba88b (diff)
downloadgem5-6b37bb67101803f12b6ed2bef714af583d03f814.tar.xz
Merge zizzer.eecs.umich.edu:/bk/newmem
into vm1.(none):/home/stever/bk/newmem-head --HG-- extra : convert_revision : c2350e01a052114a264f26551b13fca03a835c61
Diffstat (limited to 'src/mem/cache')
-rw-r--r--src/mem/cache/cache_impl.hh4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh
index 57ebff322..ff35a0749 100644
--- a/src/mem/cache/cache_impl.hh
+++ b/src/mem/cache/cache_impl.hh
@@ -342,8 +342,8 @@ Cache<TagStore,Coherence>::handleFill(BlkType *blk, MSHR * mshr,
target->getPtr<uint8_t>(), target->getSize());
}
} else {
- if (pkt->req->isLocked()) {
- blk->trackLoadLocked(pkt->req);
+ if (target->req->isLocked()) {
+ blk->trackLoadLocked(target->req);
}
std::memcpy(target->getPtr<uint8_t>(),
blk->data + target->getOffset(blkSize),