diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-05-30 19:45:54 -0400 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-05-30 19:45:54 -0400 |
| commit | f0c05de9f98fe3c6e386d3f0346f183ce5abe6c8 (patch) | |
| tree | 15ce09bb61f953960bd77c388e76d63e0ae8b6c5 /src/cpu/simple/atomic.cc | |
| parent | e371dc32a94b0c4ffe7192aad634b425b5b43437 (diff) | |
| parent | aa11330ddbb1e579aa241d01d24875cc9d86d5f8 (diff) | |
| download | gem5-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.cc')
| -rw-r--r-- | src/cpu/simple/atomic.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc index 3cad6e43f..a0d26a8ab 100644 --- a/src/cpu/simple/atomic.cc +++ b/src/cpu/simple/atomic.cc @@ -106,11 +106,10 @@ AtomicSimpleCPU::CpuPort::recvStatusChange(Status status) panic("AtomicSimpleCPU doesn't expect recvStatusChange callback!"); } -Packet * +void AtomicSimpleCPU::CpuPort::recvRetry() { panic("AtomicSimpleCPU doesn't expect recvRetry callback!"); - return NULL; } |