Merge ktlim@zizzer:/bk/newmem

[gem5.git] / src / mem / cache / cache_blk.hh

diff --git a/src/mem/cache/cache_blk.hh b/src/mem/cache/cache_blk.hh
index 7b999e4b1f655388174f73849fb4975175520a34..fa00a0f5af5e670e0fc6df0f7dca7f0357501134 100644 (file)
--- a/src/mem/cache/cache_blk.hh
+++ b/src/mem/cache/cache_blk.hh
@@ -37,7 +37,7 @@
 
 #include <list>
 
-#include "sim/root.hh"         // for Tick
+#include "sim/core.hh"         // for Tick
 #include "arch/isa_traits.hh"  // for Addr
 #include "mem/request.hh"
 
@@ -249,7 +249,7 @@ class CacheBlk
                 }
             }
 
-            req->setScResult(success ? 1 : 0);
+            req->setExtraData(success ? 1 : 0);
             clearLoadLocks();
             return success;
         } else {