first pass at merging m5 with linux

--HG--
extra : convert_revision : dfe23349b80ae3b34d3cb95c5734e01ef62f700e

1 files changed, 1 insertions, 24 deletions

diff --git a/sim/sim_object.cc b/sim/sim_object.cc
index 2ec588afa..5602a89a2 100644
--- a/sim/sim_object.cc
+++ b/sim/sim_object.cc
@@ -35,7 +35,7 @@
 #include "sim/configfile.hh"
 #include "sim/host.hh"
 #include "sim/sim_object.hh"
-#include "sim/sim_stats.hh"
+#include "sim/stats.hh"
 #include "sim/param.hh"
 
 using namespace std;
@@ -85,14 +85,6 @@ SimObject::resetStats()
 }
 
 //
-// no default extra output
-//
-void
-SimObject::printExtraOutput(ostream &os)
-{
-}
-
-//
 // static function:
 //   call regStats() on all SimObjects and then regFormulas() on all
 //   SimObjects.
@@ -163,21 +155,6 @@ SimObject::resetAllStats()
 }
 
 //
-// static function: call printExtraOutput() on all SimObjects.
-//
-void
-SimObject::printAllExtraOutput(ostream &os)
-{
-    SimObjectList::iterator i = simObjectList.begin();
-    SimObjectList::iterator end = simObjectList.end();
-
-    for (; i != end; ++i) {
-        SimObject *obj = *i;
-        obj->printExtraOutput(os);
-   }
-}
-
-//
 // static function: serialize all SimObjects.
 //
 void