Merge vm1.(none):/home/stever/bk/newmem-head

into  vm1.(none):/home/stever/bk/newmem-cache2

src/base/traceflags.py:
    Hand merge.

--HG--
extra : convert_revision : 9e7539eeab4220ed7a7237457a8f336f79216924

1 files changed, 8 insertions, 4 deletions

diff --git a/src/arch/mips/linux/process.hh b/src/arch/mips/linux/process.hh
index 398e1cfc2..d18c96188 100644
--- a/src/arch/mips/linux/process.hh
+++ b/src/arch/mips/linux/process.hh
@@ -30,7 +30,8 @@
 #define __MIPS_LINUX_PROCESS_HH__
 
 #include "arch/mips/process.hh"
-
+#include "arch/mips/linux/linux.hh"
+#include "sim/eventq.hh"
 
 /// A process with emulated Mips/Linux syscalls.
 class MipsLinuxProcess : public MipsLiveProcess
@@ -48,16 +49,19 @@ class MipsLinuxProcess : public MipsLiveProcess
                       uint64_t _gid, uint64_t _egid,
                       uint64_t _pid, uint64_t _ppid);
 
+    void startup();
+
     virtual SyscallDesc* getDesc(int callnum);
 
     /// The target system's hostname.
     static const char *hostname;
 
-     /// Array of syscall descriptors, indexed by call number.
-    static SyscallDesc syscallDescs[];
+    /// ID of the thread group leader for the process
+    uint64_t __tgid;
 
+    /// Array of syscall descriptors, indexed by call number.
+    static SyscallDesc syscallDescs[];
     const int Num_Syscall_Descs;
 };
 
-
 #endif // __MIPS_LINUX_PROCESS_HH__