diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-07-19 17:59:04 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-07-19 17:59:04 -0400 |
| commit | 15e5ce96c76a20b9b27e5f7d7ed29e962422ad1a (patch) | |
| tree | 610a888b2de5d25c166f65819d8ad3058d13723c /src/cpu/o3/thread_context.hh | |
| parent | b36796914af8bfc6729cc8a519e57572460e43e8 (diff) | |
| parent | 6175f712b3216f3e5387b07d9c41c1931c09acd9 (diff) | |
| download | gem5-15e5ce96c76a20b9b27e5f7d7ed29e962422ad1a.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem.head
--HG--
extra : convert_revision : 8c747208d72ffbb0160a2ad4a75383420debdf83
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(); |