Merge with head, hopefully the last time for this batch.

[gem5.git] / src / sim / process_impl.hh

diff --git a/src/sim/process_impl.hh b/src/sim/process_impl.hh
index fe1cdfc34f89b84daf6d5f763a6e1075309ee7ca..0fb8274986b5d87ceefef527edbcde209e25cd49 100644 (file)
--- a/src/sim/process_impl.hh
+++ b/src/sim/process_impl.hh
@@ -32,15 +32,6 @@
 #ifndef __SIM_PROCESS_IMPL_HH__
 #define __SIM_PROCESS_IMPL_HH__
 
-//
-// The purpose of this code is to fake the loader & syscall mechanism
-// when there's no OS: thus there's no reason to use it in FULL_SYSTEM
-// mode when we do have an OS.
-//
-#include "config/full_system.hh"
-
-#if !FULL_SYSTEM
-
 #include <string>
 #include <vector>
 
@@ -69,7 +60,4 @@ copyStringArray(std::vector<std::string> &strings,
     memProxy->writeBlob(array_ptr, (uint8_t*)&data_ptr, sizeof(AddrType));
 }
 
-
-#endif // !FULL_SYSTEM
-
 #endif