diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-08-16 23:39:44 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-08-16 23:39:44 -0400 |
| commit | 57db6caab1b599c1e27d98e3363bbef6ffab0945 (patch) | |
| tree | c34b679f400f415315f6f553fa7d40eb3ab87875 /src/mem/physical.hh | |
| parent | c6c5cc1ad52c9b2ee69e6de278e7b7255ef2dc33 (diff) | |
| parent | c7bb14ac7995f550104a92cfa535cc29e0c46371 (diff) | |
| download | gem5-57db6caab1b599c1e27d98e3363bbef6ffab0945.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/tmp/m5.newmem
--HG--
extra : convert_revision : b754945635cc0864fdd68ec4bee736aab9bca407
Diffstat (limited to 'src/mem/physical.hh')
| -rw-r--r-- | src/mem/physical.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mem/physical.hh b/src/mem/physical.hh index c0a5523ba..1489e6700 100644 --- a/src/mem/physical.hh +++ b/src/mem/physical.hh @@ -112,7 +112,7 @@ class PhysicalMemory : public MemObject unsigned int drain(Event *de); protected: - Tick doFunctionalAccess(Packet *pkt); + void doFunctionalAccess(Packet *pkt); virtual Tick calculateLatency(Packet *pkt); void recvStatusChange(Port::Status status); |