Merge ktlim@zizzer:/bk/newmem

into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix

--HG--
extra : convert_revision : a9a41e2c292bd95aa148e1cf4d9a77c0622a462b

diff --cc src/cpu/simple_thread.cc
Simple merge

diff --cc src/cpu/simple_thread.hh
Simple merge

diff --cc src/mem/bus.cc
Simple merge

diff --cc src/mem/bus.hh
index 27624b3780c0005e48c1e06f497abe25825ce211,619720a7918a70e24f9a67ba4f0878293261adbc..1d1cfde89d036a55605cf931624b3aff121bc6d0
--- 1/src/mem/bus.hh
--- 2/src/mem/bus.hh
+++ b/src/mem/bus.hh
@@@ -249,11 -250,11 +252,13 @@@ class Bus : public MemObjec
  
      virtual void init();
  
-     Bus(const std::string &n, int bus_id, int _clock, int _width)
 +    unsigned int drain(Event *de);
 +
+     Bus(const std::string &n, int bus_id, int _clock, int _width,
+         bool responder_set)
          : MemObject(n), busId(bus_id), clock(_clock), width(_width),
-         tickNextIdle(0), busIdle(this), inRetry(false), defaultPort(NULL)
+           tickNextIdle(0), busIdle(this), inRetry(false), defaultPort(NULL),
+           responderSet(responder_set)
      {
          //Both the width and clock period must be positive
          if (width <= 0)