Merge zizzer.eecs.umich.edu:/bk/newmem

into  iceaxe.:/Volumes/work/research/m5/newmem

--HG--
extra : convert_revision : e457e807b29d8ff88ac335cd50acd596e7e31eee

2 files changed, 0 insertions, 21 deletions

diff --git a/src/sim/system.cc b/src/sim/system.cc
index 7953607d5..b3c7870fd 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -132,8 +132,6 @@ System::~System()
 #if FULL_SYSTEM
     delete kernelSymtab;
     delete kernel;
-
-    delete kernelBinning;
 #else
     panic("System::fixFuncEventAddr needs to be rewritten "
           "to work with syscall emulation");
@@ -220,19 +218,9 @@ System::new_page()
 #endif
 
 void
-System::regStats()
-{
-#if FULL_SYSTEM
-    kernelBinning->regStats(name() + ".kern");
-#endif // FULL_SYSTEM
-}
-
-void
 System::serialize(ostream &os)
 {
 #if FULL_SYSTEM
-    kernelBinning->serialize(os);
-
     kernelSymtab->serialize("kernel_symtab", os);
 #endif // FULL_SYSTEM
 }
@@ -242,8 +230,6 @@ void
 System::unserialize(Checkpoint *cp, const string &section)
 {
 #if FULL_SYSTEM
-    kernelBinning->unserialize(cp, section);
-
     kernelSymtab->unserialize("kernel_symtab", cp, section);
 #endif // FULL_SYSTEM
 }
diff --git a/src/sim/system.hh b/src/sim/system.hh
index 3a9fdc3d2..059dc92dc 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -56,7 +56,6 @@ class PhysicalMemory;
 class Platform;
 class GDBListener;
 class RemoteGDB;
-namespace Kernel { class Binning; }
 #endif
 
 class System : public SimObject
@@ -100,8 +99,6 @@ class System : public SimObject
     /** Entry point in the kernel to start at */
     Addr kernelEntry;
 
-    Kernel::Binning *kernelBinning;
-
 #else
 
     int page_ptr;
@@ -161,9 +158,6 @@ class System : public SimObject
         Tick boot_cpu_frequency;
         std::string boot_osflags;
         uint64_t init_param;
-        bool bin;
-        std::vector<std::string> binned_fns;
-        bool bin_int;
 
         std::string kernel_path;
         std::string readfile;
@@ -211,7 +205,6 @@ class System : public SimObject
     int registerThreadContext(ThreadContext *tc, int tcIndex);
     void replaceThreadContext(ThreadContext *tc, int tcIndex);
 
-    void regStats();
     void serialize(std::ostream &os);
     void unserialize(Checkpoint *cp, const std::string &section);