summaryrefslogtreecommitdiff
path: root/src/cpu/simple
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2007-02-12 18:40:08 -0500
committerAli Saidi <saidi@eecs.umich.edu>2007-02-12 18:40:08 -0500
commitf72a9993931c7b986df771878e22cada0028955f (patch)
tree90d866e30806665010affd0ae134ebbad5c98d92 /src/cpu/simple
parent49a9378718587bf120495aaf3087fcd2c6b87f9e (diff)
downloadgem5-f72a9993931c7b986df771878e22cada0028955f.tar.xz
some forgotten commits
--HG-- extra : convert_revision : 213440066c700ed5891a6d4568928b7f3f2fe750
Diffstat (limited to 'src/cpu/simple')
-rw-r--r--src/cpu/simple/atomic.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index 072867536..3001241fe 100644
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -422,7 +422,7 @@ AtomicSimpleCPU::write(T data, Addr addr, unsigned flags, uint64_t *res)
assert(res);
*res = pkt->get<T>();
} else if (res) {
- *res = req->getScResult();
+ *res = req->getExtraData();
}
}