From 5b433568f05c6f1b093628c2a90f8383abfc1168 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Sun, 30 Oct 2011 00:32:54 -0700
Subject: SE/FS: Build the base process class in FS.

---
 src/cpu/thread_state.hh | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'src/cpu/thread_state.hh')

diff --git a/src/cpu/thread_state.hh b/src/cpu/thread_state.hh
index 1087c27c2..10b87f02c 100644
--- a/src/cpu/thread_state.hh
+++ b/src/cpu/thread_state.hh
@@ -36,11 +36,8 @@
 #include "cpu/base.hh"
 #include "cpu/profile.hh"
 #include "cpu/thread_context.hh"
-
-#if !FULL_SYSTEM
 #include "mem/mem_object.hh"
 #include "sim/process.hh"
-#endif
 
 #if FULL_SYSTEM
 class EndQuiesceEvent;
@@ -66,11 +63,7 @@ class TranslatingPort;
 struct ThreadState {
     typedef ThreadContext::Status Status;
 
-#if FULL_SYSTEM
-    ThreadState(BaseCPU *cpu, ThreadID _tid);
-#else
     ThreadState(BaseCPU *cpu, ThreadID _tid, Process *_process);
-#endif
 
     ~ThreadState();
 
@@ -185,10 +178,9 @@ struct ThreadState {
     EndQuiesceEvent *quiesceEvent;
 
     TheISA::Kernel::Statistics *kernelStats;
+#endif
   protected:
-#else
     Process *process;
-#endif
 
     TranslatingPort *port;
 
-- 
cgit v1.2.3