diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-07-07 19:02:12 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-07-07 19:02:12 -0400 |
| commit | cdf27a0a864b3c3a22fbcdd2afdd00edd00613a2 (patch) | |
| tree | 756298638faee2e6520d98ca4bbee3c4f7d0f25d /src/cpu/o3/thread_context.hh | |
| parent | 8ade33d324218737c815935120307153975eeadc (diff) | |
| parent | e5aff1a7f326fb46c98bacbf4c9c42e0da94fe81 (diff) | |
| download | gem5-cdf27a0a864b3c3a22fbcdd2afdd00edd00613a2.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-o3
--HG--
extra : convert_revision : 9098d989832e2a5818b80771e3c02170c5c8cd5b
Diffstat (limited to 'src/cpu/o3/thread_context.hh')
| -rwxr-xr-x | src/cpu/o3/thread_context.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/o3/thread_context.hh b/src/cpu/o3/thread_context.hh index d097ee63e..df8d1a6d8 100755 --- a/src/cpu/o3/thread_context.hh +++ b/src/cpu/o3/thread_context.hh @@ -112,7 +112,7 @@ class O3ThreadContext : public ThreadContext virtual void suspend(); /** Set the status to Unallocated. */ - virtual void deallocate(); + virtual void deallocate(int delay = 0); /** Set the status to Halted. */ virtual void halt(); |