From de21bb93ea4312a7e958698c634b16b10e02e21a Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Fri, 18 Nov 2011 01:33:28 -0800
Subject: SE/FS: Get rid of FULL_SYSTEM in the CPU directory.

---
 src/cpu/ozone/dyn_inst_impl.hh | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/cpu/ozone/dyn_inst_impl.hh')

diff --git a/src/cpu/ozone/dyn_inst_impl.hh b/src/cpu/ozone/dyn_inst_impl.hh
index 5eb8ea8da..715c988fc 100644
--- a/src/cpu/ozone/dyn_inst_impl.hh
+++ b/src/cpu/ozone/dyn_inst_impl.hh
@@ -31,11 +31,8 @@
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "cpu/ozone/dyn_inst.hh"
-#include "sim/faults.hh"
-
-#if FULL_SYSTEM
 #include "kern/kernel_stats.hh"
-#endif
+#include "sim/faults.hh"
 
 template <class Impl>
 OzoneDynInst<Impl>::OzoneDynInst(OzoneCPU *cpu)
@@ -239,8 +236,6 @@ OzoneDynInst<Impl>::setMiscReg(int misc_reg, const MiscReg &val)
     this->thread->setMiscReg(misc_reg, val);
 }
 
-#if FULL_SYSTEM
-
 template <class Impl>
 Fault
 OzoneDynInst<Impl>::hwrei()
@@ -269,11 +264,10 @@ OzoneDynInst<Impl>::simPalCheck(int palFunc)
 {
     return this->cpu->simPalCheck(palFunc);
 }
-#else
+
 template <class Impl>
 void
 OzoneDynInst<Impl>::syscall(uint64_t &callnum)
 {
     this->cpu->syscall(callnum);
 }
-#endif
-- 
cgit v1.2.3