diff options
author | Kevin Lim <ktlim@umich.edu> | 2006-10-31 14:37:19 -0500 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2006-10-31 14:37:19 -0500 |
commit | 5825a6c9d82b813d983b688da5f1ce18c90f774f (patch) | |
tree | a5be1a1c3968ff57d387523f95e46bcb2797c121 /src/mem/tport.hh | |
parent | 7f39644609e19ada9e94c9bbb09c3e625fa6e8ed (diff) | |
parent | bfd5eb2b08dad700d085a637d5e16a61dcc530d7 (diff) | |
download | gem5-5825a6c9d82b813d983b688da5f1ce18c90f774f.tar.xz |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix
configs/example/fs.py:
configs/example/se.py:
src/mem/tport.hh:
Hand merge.
--HG--
extra : convert_revision : b9df95534d43b3b311f24ae24717371d03d615bf
Diffstat (limited to 'src/mem/tport.hh')
-rw-r--r-- | src/mem/tport.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mem/tport.hh b/src/mem/tport.hh index 438ec56dc..3d28ea3e5 100644 --- a/src/mem/tport.hh +++ b/src/mem/tport.hh @@ -114,8 +114,8 @@ class SimpleTimingPort : public Port public: - SimpleTimingPort(std::string pname) - : Port(pname), sendEvent(this), drainEvent(NULL) + SimpleTimingPort(std::string pname, MemObject *_owner = NULL) + : Port(pname, _owner), sendEvent(this), drainEvent(NULL) {} /** Hook for draining timing accesses from the system. The |