first pass at merging m5 with linux

--HG--
extra : convert_revision : dfe23349b80ae3b34d3cb95c5734e01ef62f700e

1 files changed, 0 insertions, 7 deletions

diff --git a/sim/sim_object.hh b/sim/sim_object.hh
index aaaafc04b..b1dd19475 100644
--- a/sim/sim_object.hh
+++ b/sim/sim_object.hh
@@ -74,19 +74,12 @@ class SimObject : public Serializable
     virtual void regFormulas();
     virtual void resetStats();
 
-    // print extra results for this object not covered by registered
-    // statistics (called at end of simulation)
-    virtual void printExtraOutput(std::ostream&);
-
     // static: call reg_stats on all SimObjects
     static void regAllStats();
 
     // static: call resetStats on all SimObjects
     static void resetAllStats();
 
-    // static: call printExtraOutput on all SimObjects
-    static void printAllExtraOutput(std::ostream&);
-
     // static: call nameOut() & serialize() on all SimObjects
     static void serializeAll(std::ostream &);
 };