diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2004-02-29 20:25:52 -0500 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2004-02-29 20:25:52 -0500 |
| commit | 0a3948bcfd96b16887a5501231890a05bd22c5a3 (patch) | |
| tree | 32c0f6cfd5ee4a670896c9fee01224ed944de62d /cpu/exec_context.hh | |
| parent | a574c260e35d99eedfe4927b21f8d3e5ca5ce3f5 (diff) | |
| parent | ee967995196739b90c0b1c384d7e245d1dffdc80 (diff) | |
| download | gem5-0a3948bcfd96b16887a5501231890a05bd22c5a3.tar.xz | |
Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/ziff/z/binkertn/research/m5/latest
--HG--
extra : convert_revision : b3fd8bcfbaf1e9d09bac8c1403944df36dde671e
Diffstat (limited to 'cpu/exec_context.hh')
| -rw-r--r-- | cpu/exec_context.hh | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/cpu/exec_context.hh b/cpu/exec_context.hh index e9dc5efec..a4bbdd484 100644 --- a/cpu/exec_context.hh +++ b/cpu/exec_context.hh @@ -45,10 +45,7 @@ class MemoryController; #include "kern/tru64/kernel_stats.hh" #include "sim/system.hh" - -#ifdef FS_MEASURE #include "sim/sw_context.hh" -#endif #else // !FULL_SYSTEM @@ -137,10 +134,7 @@ class ExecContext MemoryController *memCtrl; PhysicalMemory *physmem; -#ifdef FS_MEASURE SWContext *swCtx; -#endif - #else Process *process; |