From: Lisa Hsu <hsul@eecs.umich.edu>
Date: Tue, 18 May 2004 05:40:03 +0000 (-0400)
Subject: merge m5 with linux for the event and binning lifting
X-Git-Tag: m5_1.0_tutorial~337
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a0ccdf8aba8f71c8d66c03f5c6907d0a3c2e091f;p=gem5.git

merge m5 with linux for the event and binning lifting

--HG--
extra : convert_revision : 09d3678746c2e9a93a9982dc75d5e1ac309cb2fa
---

a0ccdf8aba8f71c8d66c03f5c6907d0a3c2e091f
diff --cc sim/system.hh
index 0fcdd77cc,564579fe4..08fcfb784
--- a/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;