diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2012-01-31 22:40:08 -0800 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2012-01-31 22:40:08 -0800 |
| commit | ea8b347dc5d375572d8d19770024ec8be5fd5017 (patch) | |
| tree | 56bb75b1f071a749b7e90218d0d6b0e9265657bb /src/cpu/o3/fu_pool.hh | |
| parent | e88165a431a90cf7e33e205794caed898ca6fcb1 (diff) | |
| parent | 7d4f18770073d968c70cd3ffcdd117f50a6056a2 (diff) | |
| download | gem5-ea8b347dc5d375572d8d19770024ec8be5fd5017.tar.xz | |
Merge with head, hopefully the last time for this batch.
Diffstat (limited to 'src/cpu/o3/fu_pool.hh')
| -rw-r--r-- | src/cpu/o3/fu_pool.hh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/cpu/o3/fu_pool.hh b/src/cpu/o3/fu_pool.hh index ea4b53e1a..66804b534 100644 --- a/src/cpu/o3/fu_pool.hh +++ b/src/cpu/o3/fu_pool.hh @@ -37,7 +37,6 @@ #include <vector> #include "cpu/op_class.hh" -#include "cpu/sched_list.hh" #include "params/FUPool.hh" #include "sim/sim_object.hh" @@ -162,7 +161,7 @@ class FUPool : public SimObject void switchOut(); /** Takes over from another CPU's thread. */ - void takeOverFrom(); + void takeOver(); }; #endif // __CPU_O3_FU_POOL_HH__ |