merge m5 with linux for the event and binning lifting

--HG--
extra : convert_revision : 09d3678746c2e9a93a9982dc75d5e1ac309cb2fa

diff --cc cpu/base_cpu.cc
Simple merge

diff --cc cpu/base_cpu.hh
Simple merge

diff --cc kern/tru64/tru64_system.cc
Simple merge

diff --cc sim/system.hh
index 0fcdd77cc7ebea7b31131259d231b040d4e2946f,564579fe481a2fa65f7facce14d6bf78dfda3823..08fcfb784da3693811643cd44ce728bd5d6005eb
--- 1/sim/system.hh
--- 2/sim/system.hh
+++ b/sim/system.hh
@@@ -80,8 -87,8 +88,9 @@@ class System : public SimObjec
      const uint64_t init_param;
      MemoryController *memCtrl;
      PhysicalMemory *physmem;
 +    Platform *platform;
      bool bin;
+     std::vector<string> binned_fns;
  
      PCEventQueue pcEventQueue;