diff options
| author | Steve Reinhardt <steve.reinhardt@amd.com> | 2010-09-16 20:24:05 -0700 |
|---|---|---|
| committer | Steve Reinhardt <steve.reinhardt@amd.com> | 2010-09-16 20:24:05 -0700 |
| commit | 3f9f4bf3d6ce9080adb03966599e0f1a98b091eb (patch) | |
| tree | 31c4b767f6d06cfcbfbd8ea6d8155b8efc6894b3 /src/dev/intel_8254_timer.hh | |
| parent | 2dd9f4fcf02c68eb86a6742576eecb3eef3b9ddf (diff) | |
| download | gem5-3f9f4bf3d6ce9080adb03966599e0f1a98b091eb.tar.xz | |
devices: undo cset 017baf09599f that added timer drain functions.
It's not the right fix for the checkpoint deadlock problem
Brad was having, and creates another bug where the system can
deadlock on restore. Brad can't reproduce the original bug
right now, so we'll wait until it arises again and then try
to fix it the right way then.
Diffstat (limited to 'src/dev/intel_8254_timer.hh')
| -rw-r--r-- | src/dev/intel_8254_timer.hh | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/dev/intel_8254_timer.hh b/src/dev/intel_8254_timer.hh index 26ea0687e..30ddc7bca 100644 --- a/src/dev/intel_8254_timer.hh +++ b/src/dev/intel_8254_timer.hh @@ -137,10 +137,6 @@ class Intel8254Timer : public EventManager /** Pointer to container */ Intel8254Timer *parent; - /** if non-zero, the scheduled tick of an event used for drain - serialization coordination */ - Tick event_tick; - public: Counter(Intel8254Timer *p, const std::string &name, unsigned int num); @@ -169,12 +165,6 @@ class Intel8254Timer : public EventManager bool outputHigh(); /** - * Drain all associated events. - * @param drainEvent - */ - unsigned int drain(Event *de); - - /** * Serialize this object to the given output stream. * @param base The base name of the counter object. * @param os The stream to serialize to. @@ -239,8 +229,6 @@ class Intel8254Timer : public EventManager return counter[num]->outputHigh(); } - unsigned int drain(Event *de); - /** * Serialize this object to the given output stream. * @param base The base name of the counter object. |