7 files changed, 23 insertions, 59 deletions
diff --git a/src/kern/SConscript b/src/kern/SConscript
index 93394829b..38734e650 100644
--- a/src/kern/SConscript
+++ b/src/kern/SConscript
@@ -33,23 +33,21 @@ Import('*')
 if env['TARGET_ISA'] == 'no':
     Return()
 
-if env['FULL_SYSTEM']:
-    Source('kernel_stats.cc')
-    Source('system_events.cc')
+Source('kernel_stats.cc')
+Source('linux/events.cc')
+Source('linux/linux.cc')
+Source('linux/linux_syscalls.cc')
+Source('linux/printk.cc')
+Source('operatingsystem.cc')
+Source('system_events.cc')
 
-    DebugFlag('DebugPrintf')
-    DebugFlag('Printf')
+DebugFlag('DebugPrintf')
+DebugFlag('Printf')
 
-    Source('linux/events.cc')
-    Source('linux/linux_syscalls.cc')
-    Source('linux/printk.cc')
-    
-    if env['TARGET_ISA'] == 'alpha':
-        Source('tru64/dump_mbuf.cc')
-        Source('tru64/printf.cc')
-        Source('tru64/tru64_events.cc')
-        Source('tru64/tru64_syscalls.cc')
-        DebugFlag('BADADDR')
-else:
-    Source('linux/linux.cc')
-    Source('operatingsystem.cc')
+if env['TARGET_ISA'] == 'alpha':
+    Source('tru64/dump_mbuf.cc')
+    Source('tru64/printf.cc')
+    Source('tru64/tru64_events.cc')
+    Source('tru64/tru64_syscalls.cc')
+
+    DebugFlag('BADADDR')
diff --git a/src/kern/kernel_stats.cc b/src/kern/kernel_stats.cc
index 09c1a6760..96e219bd4 100644
--- a/src/kern/kernel_stats.cc
+++ b/src/kern/kernel_stats.cc
@@ -33,8 +33,10 @@
 
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
-#include "kern/tru64/tru64_syscalls.hh"
 #include "kern/kernel_stats.hh"
+#if THE_ISA == ALPHA_ISA
+#include "kern/tru64/tru64_syscalls.hh"
+#endif
 #include "sim/system.hh"
 
 using namespace std;
@@ -90,13 +92,14 @@ Statistics::regStats(const string &_name)
         ;
 
     _iplUsed = _iplGood / _iplCount;
-
+#if THE_ISA == ALPHA_ISA
     _syscall
         .init(SystemCalls<Tru64>::Number)
         .name(name() + ".syscall")
         .desc("number of syscalls executed")
         .flags(total | pdf | nozero | nonan)
         ;
+#endif
 
     //@todo This needs to get the names of syscalls from an appropriate place.
 #if 0
diff --git a/src/kern/kernel_stats.hh b/src/kern/kernel_stats.hh
index e4ca67fcb..d5abde83f 100644
--- a/src/kern/kernel_stats.hh
+++ b/src/kern/kernel_stats.hh
@@ -61,7 +61,9 @@ class Statistics : public Serializable
     Stats::Vector _iplTicks;
     Stats::Formula _iplUsed;
 
+#if THE_ISA == ALPHA_ISA
     Stats::Vector _syscall;
+#endif
 //    Stats::Vector _faults;
 
   private:
diff --git a/src/kern/linux/linux.hh b/src/kern/linux/linux.hh
index 7fe107139..30ebdbb4a 100644
--- a/src/kern/linux/linux.hh
+++ b/src/kern/linux/linux.hh
@@ -32,13 +32,6 @@
 #define __LINUX_HH__
 
 #include "base/types.hh"
-#include "config/full_system.hh"
-
-#if FULL_SYSTEM
-
-class Linux {};
-
-#else //!FULL_SYSTEM
 
 #include <string>
 
@@ -180,7 +173,4 @@ class Linux : public OperatingSystem
 
 };  // class Linux
 
-
-#endif // FULL_SYSTEM
-
 #endif // __LINUX_HH__
diff --git a/src/kern/operatingsystem.hh b/src/kern/operatingsystem.hh
index 6574e3c6b..fd5899cf8 100644
--- a/src/kern/operatingsystem.hh
+++ b/src/kern/operatingsystem.hh
@@ -32,13 +32,7 @@
 #define __KERN_OPERATINGSYSTEM_HH__
 
 #include "base/types.hh"
-#include "config/full_system.hh"
 
-#if FULL_SYSTEM
-
-class OperatingSystem {};
-
-#else //!FULL_SYSTEM
 #include <string>
 
 class LiveProcess;
@@ -128,7 +122,4 @@ class OperatingSystem {
 
 };  // class OperatingSystem
 
-
-#endif // FULL_SYSTEM
-
 #endif // __OPERATINGSYSTEM_HH__
diff --git a/src/kern/solaris/solaris.hh b/src/kern/solaris/solaris.hh
index c6fb93f04..9cd5af16f 100644
--- a/src/kern/solaris/solaris.hh
+++ b/src/kern/solaris/solaris.hh
@@ -32,14 +32,6 @@
 #define __SOLARIS_HH__
 
 #include "base/types.hh"
-#include "config/full_system.hh"
-
-#if FULL_SYSTEM
-
-class Solaris {};
-
-#else //!FULL_SYSTEM
-
 #include "kern/operatingsystem.hh"
 
 ///
@@ -124,7 +116,4 @@ class Solaris : public OperatingSystem
 
 };  // class Solaris
 
-
-#endif // FULL_SYSTEM
-
 #endif // __SOLARIS_HH__
diff --git a/src/kern/tru64/tru64.hh b/src/kern/tru64/tru64.hh
index 776607c85..3b9bbd2bf 100644
--- a/src/kern/tru64/tru64.hh
+++ b/src/kern/tru64/tru64.hh
@@ -32,16 +32,9 @@
 #ifndef __TRU64_HH__
 #define __TRU64_HH__
 
-#include "config/full_system.hh"
 #include "kern/operatingsystem.hh"
 #include "sim/byteswap.hh"
 
-#if FULL_SYSTEM
-
-class Tru64 {};
-
-#else //!FULL_SYSTEM
-
 #include <sys/stat.h>
 #include <sys/types.h>
 #if defined(__OpenBSD__) || defined(__APPLE__) || defined(__FreeBSD__)
@@ -1226,6 +1219,4 @@ class Tru64_PreF64 : public Tru64
     }
 };
 
-#endif // FULL_SYSTEM
-
 #endif // __TRU64_HH__