diff options
| author | Derek Hower <drh5@cs.wisc.edu> | 2009-09-10 22:02:13 -0500 |
|---|---|---|
| committer | Derek Hower <drh5@cs.wisc.edu> | 2009-09-10 22:02:13 -0500 |
| commit | 1e40ee4ea081908782dd7ba159b9f680d933855c (patch) | |
| tree | 86ea0a84a133b237eb1cd4c0f790765ae08905fb /src/mem/ruby/system/Sequencer.hh | |
| parent | ca0e0c368357f1e31b69c92ada4e3021b84d5560 (diff) | |
| parent | 0637fe0bfd626711b2535cbdf5c40ba67fa7cdfe (diff) | |
| download | gem5-1e40ee4ea081908782dd7ba159b9f680d933855c.tar.xz | |
Automated merge with ssh://hg@m5sim.org/m5
Diffstat (limited to 'src/mem/ruby/system/Sequencer.hh')
| -rw-r--r-- | src/mem/ruby/system/Sequencer.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mem/ruby/system/Sequencer.hh b/src/mem/ruby/system/Sequencer.hh index 2b1f023c5..e75cdaa3a 100644 --- a/src/mem/ruby/system/Sequencer.hh +++ b/src/mem/ruby/system/Sequencer.hh @@ -84,7 +84,7 @@ public: // called by Tester or Simics int64_t makeRequest(const RubyRequest & request); - bool isReady(const RubyRequest& request); + bool isReady(const RubyRequest& request, bool dont_set = false); bool empty() const; void print(ostream& out) const; @@ -125,7 +125,7 @@ private: // Global outstanding request count, across all request tables int m_outstanding_count; bool m_deadlock_check_scheduled; - int m_servicing_atomic; + unsigned m_servicing_atomic; int m_atomics_counter; }; |