diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-08-15 05:08:30 -0400 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-08-15 05:08:30 -0400 |
| commit | cd6eb5396569bd2a3b16148f0d5277f7f4ee1391 (patch) | |
| tree | f587628bf43f6374ca351c295116b8b70fc90aee /src/cpu | |
| parent | 74546aac0124a5ba09a0e6bfef18dc3e0b7509b8 (diff) | |
| parent | c9900f159e8d2fd7e32070e2cd0971caf917431d (diff) | |
| download | gem5-cd6eb5396569bd2a3b16148f0d5277f7f4ee1391.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
src/cpu/static_inst.hh:
SCCS merged
--HG--
extra : convert_revision : a4f6377dbd691ab58fe5f7958b983b092575f250
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/simple/base.cc | 1 | ||||
| -rw-r--r-- | src/cpu/static_inst.hh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc index 622455745..801c96c88 100644 --- a/src/cpu/simple/base.cc +++ b/src/cpu/simple/base.cc @@ -29,6 +29,7 @@ */ #include "arch/utility.hh" +#include "arch/faults.hh" #include "base/cprintf.hh" #include "base/inifile.hh" #include "base/loader/symtab.hh" diff --git a/src/cpu/static_inst.hh b/src/cpu/static_inst.hh index 9d76c1225..578d14191 100644 --- a/src/cpu/static_inst.hh +++ b/src/cpu/static_inst.hh @@ -35,6 +35,7 @@ #include <string> #include "arch/isa_traits.hh" +#include "sim/faults.hh" #include "base/bitfield.hh" #include "base/hashmap.hh" #include "base/misc.hh" |