1 files changed, 7 insertions, 7 deletions
diff --git a/src/cpu/o3/commit.hh b/src/cpu/o3/commit.hh
index 2d8d88b21..c76d6c1d0 100644
--- a/src/cpu/o3/commit.hh
+++ b/src/cpu/o3/commit.hh
@@ -199,13 +199,16 @@ class DefaultCommit
     void startupStage();
 
     /** Initializes the draining of commit. */
-    bool drain();
+    void drain();
 
     /** Resumes execution after draining. */
-    void resume();
+    void drainResume();
 
-    /** Completes the switch out of commit. */
-    void switchOut();
+    /** Perform sanity checks after a drain. */
+    void drainSanityCheck() const;
+
+    /** Has the stage drained? */
+    bool isDrained() const;
 
     /** Takes over from another CPU's thread. */
     void takeOverFrom();
@@ -438,9 +441,6 @@ class DefaultCommit
     /** Is a drain pending. */
     bool drainPending;
 
-    /** Is commit switched out. */
-    bool switchedOut;
-
     /** The latency to handle a trap.  Used when scheduling trap
      * squash event.
      */