Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/work/bk/bincleanup

--HG--
extra : convert_revision : 7b5dc465231a861f0b460e3cbf9ee2ad2b2f5246

2 files changed, 4 insertions, 8 deletions

diff --git a/sim/system.cc b/sim/system.cc
index db93250ee..36275f400 100644
--- a/sim/system.cc
+++ b/sim/system.cc
@@ -50,13 +50,11 @@ System::System(const std::string _name,
 {
     // add self to global system list
     systemList.push_back(this);
-#ifdef FS_MEASURE
     if (bin == true) {
-        nonPath = new Statistics::MainBin("non TCPIP path stats");
-        nonPath->activate();
+        Kernel = new Statistics::MainBin("non TCPIP Kernel stats");
+        Kernel->activate();
     } else
-        nonPath = NULL;
-#endif
+        Kernel = NULL;
 }
 
 
@@ -104,7 +102,6 @@ printSystems()
     System::printSystems();
 }
 
-#ifdef FS_MEASURE
 Statistics::MainBin *
 System::getBin(const std::string &name)
 {
@@ -127,7 +124,6 @@ System::findContext(Addr pcb)
   } else
       return NULL;
 }
-#endif //FS_MEASURE
 
 DEFINE_SIM_OBJECT_CLASS_NAME("System", System)
 
diff --git a/sim/system.hh b/sim/system.hh
index 2e0cb3dbf..aba5f2590 100644
--- a/sim/system.hh
+++ b/sim/system.hh
@@ -54,7 +54,7 @@ class System : public SimObject
 
   public:
     Statistics::Scalar<Counter> fnCalls;
-    Statistics::MainBin *nonPath;
+    Statistics::MainBin *Kernel;
 
     Statistics::MainBin * getBin(const std::string &name);
     virtual bool findCaller(std::string, std::string) const = 0;