diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-11-08 16:18:10 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-11-08 16:18:10 -0500 |
| commit | f720029e97358b2f69ea0ecaace89d5c2ccc6bfe (patch) | |
| tree | 49f739cbc78b842fc303c1a1296d293ca03ec961 /src/mem/bus.hh | |
| parent | 5b90922ad59189f5967dc97a00bbfead062f4ba3 (diff) | |
| parent | 74745cfeac4f4de4613d8faed77aa7e3c06cbca4 (diff) | |
| download | gem5-f720029e97358b2f69ea0ecaace89d5c2ccc6bfe.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem/
into zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops
--HG--
extra : convert_revision : dc165840841bdd88e40111b98d1be493441703f0
Diffstat (limited to 'src/mem/bus.hh')
| -rw-r--r-- | src/mem/bus.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mem/bus.hh b/src/mem/bus.hh index 1d1cfde89..ff1d2545d 100644 --- a/src/mem/bus.hh +++ b/src/mem/bus.hh @@ -257,8 +257,8 @@ class Bus : public MemObject Bus(const std::string &n, int bus_id, int _clock, int _width, bool responder_set) : MemObject(n), busId(bus_id), clock(_clock), width(_width), - tickNextIdle(0), busIdle(this), inRetry(false), defaultPort(NULL), - responderSet(responder_set) + tickNextIdle(0), drainEvent(NULL), busIdle(this), inRetry(false), + defaultPort(NULL), responderSet(responder_set) { //Both the width and clock period must be positive if (width <= 0) |