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/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/thread_context.hh')
-rw-r--r-- | src/cpu/thread_context.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/thread_context.hh b/src/cpu/thread_context.hh index 70d705144..e019e22bc 100644 --- a/src/cpu/thread_context.hh +++ b/src/cpu/thread_context.hh @@ -143,7 +143,7 @@ class ThreadContext virtual void suspend() = 0; /// Set the status to Unallocated. - virtual void deallocate() = 0; + virtual void deallocate(int delay = 0) = 0; /// Set the status to Halted. virtual void halt() = 0; @@ -318,7 +318,7 @@ class ProxyThreadContext : public ThreadContext void suspend() { actualTC->suspend(); } /// Set the status to Unallocated. - void deallocate() { actualTC->deallocate(); } + void deallocate(int delay = 0) { actualTC->deallocate(); } /// Set the status to Halted. void halt() { actualTC->halt(); } |