diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2012-01-07 02:10:34 -0800 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2012-01-07 02:10:34 -0800 |
| commit | 36a822f08e88483b41af214ace4fd3dccf3aa8cb (patch) | |
| tree | d7c4c08590459d967a1d7638b02c586911826953 /src/cpu/inorder | |
| parent | 85424bef192c02a47c0d46c2d99ac0a5d6e55a99 (diff) | |
| parent | f171a29118e1d80c04c72d2fb5f024fed4fb62af (diff) | |
| download | gem5-36a822f08e88483b41af214ace4fd3dccf3aa8cb.tar.xz | |
Merge with main repository.
Diffstat (limited to 'src/cpu/inorder')
| -rw-r--r-- | src/cpu/inorder/cpu.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/cpu/inorder/cpu.cc b/src/cpu/inorder/cpu.cc index 9d6ecc7e1..010bdb512 100644 --- a/src/cpu/inorder/cpu.cc +++ b/src/cpu/inorder/cpu.cc @@ -206,7 +206,6 @@ InOrderCPU::InOrderCPU(Params *params) lastRunningCycle(0), instsPerSwitch(0) { - ThreadID active_threads; cpu_params = params; resPool = new ResourcePool(this, params); @@ -214,6 +213,7 @@ InOrderCPU::InOrderCPU(Params *params) // Resize for Multithreading CPUs thread.resize(numThreads); + ThreadID active_threads = params->workload.size(); if (FullSystem) { active_threads = 1; } else { @@ -1110,7 +1110,6 @@ InOrderCPU::updateThreadPriority() //DEFAULT TO ROUND ROBIN SCHEME //e.g. Move highest priority to end of thread list list<ThreadID>::iterator list_begin = activeThreads.begin(); - list<ThreadID>::iterator list_end = activeThreads.end(); unsigned high_thread = *list_begin; |