summaryrefslogtreecommitdiff
path: root/src/cpu/simple/atomic.hh
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-05-30 19:45:54 -0400
committerSteve Reinhardt <stever@eecs.umich.edu>2006-05-30 19:45:54 -0400
commitf0c05de9f98fe3c6e386d3f0346f183ce5abe6c8 (patch)
tree15ce09bb61f953960bd77c388e76d63e0ae8b6c5 /src/cpu/simple/atomic.hh
parente371dc32a94b0c4ffe7192aad634b425b5b43437 (diff)
parentaa11330ddbb1e579aa241d01d24875cc9d86d5f8 (diff)
downloadgem5-f0c05de9f98fe3c6e386d3f0346f183ce5abe6c8.tar.xz
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/z/stever/bk/newmem-py --HG-- extra : convert_revision : 36640569d33c4410320b8444bb572f408bf5edde
Diffstat (limited to 'src/cpu/simple/atomic.hh')
-rw-r--r--src/cpu/simple/atomic.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/simple/atomic.hh b/src/cpu/simple/atomic.hh
index ab3a3e8ef..65269bd6d 100644
--- a/src/cpu/simple/atomic.hh
+++ b/src/cpu/simple/atomic.hh
@@ -98,7 +98,7 @@ class AtomicSimpleCPU : public BaseSimpleCPU
virtual void recvStatusChange(Status status);
- virtual Packet *recvRetry();
+ virtual void recvRetry();
virtual void getDeviceAddressRanges(AddrRangeList &resp,
AddrRangeList &snoop)