From 310d8f0992637d69e270cac727ba0ff968cdb6ea Mon Sep 17 00:00:00 2001
From: Kevin Lim <ktlim@umich.edu>
Date: Tue, 6 Feb 2007 15:54:44 -0500
Subject: Fix for LL/SC that Ron sent me.

--HG--
extra : convert_revision : b3510a23d8a9eb466939f38491a109c3a65a7363
---
 src/mem/cache/cache_impl.hh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mem')

diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh
index b8c896498..10c244b8e 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),
-- 
cgit v1.2.3


From 38db47005c9126949593a307e18641b2fc4d9e85 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <binkertn@umich.edu>
Date: Tue, 6 Feb 2007 22:31:15 -0800
Subject: Include compiler.hh since we use some of the #defines

--HG--
extra : convert_revision : 1040addcf3f52d8d9fed2930890dadf524205af9
---
 src/mem/packet.hh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mem')

diff --git a/src/mem/packet.hh b/src/mem/packet.hh
index 15f605ca7..a4c003e8b 100644
--- a/src/mem/packet.hh
+++ b/src/mem/packet.hh
@@ -41,6 +41,7 @@
 #include <cassert>
 #include <list>
 
+#include "base/compiler.hh"
 #include "base/misc.hh"
 #include "mem/request.hh"
 #include "sim/host.hh"
-- 
cgit v1.2.3