diff options
| author | Steve Reinhardt <stever@gmail.com> | 2008-02-11 08:31:26 -0800 |
|---|---|---|
| committer | Steve Reinhardt <stever@gmail.com> | 2008-02-11 08:31:26 -0800 |
| commit | 71835d42df8fb488380be8cc89be4298b268902a (patch) | |
| tree | 7c2e91d34de4a2306f45234fefa13ded7ea5d83f /src/cpu/o3/cpu.cc | |
| parent | 2f7421b12b4a557ff1a2e4dcebcfd3484778fb95 (diff) | |
| parent | 4c7eb211191055f72c6f157913cb384f47cf4334 (diff) | |
| download | gem5-71835d42df8fb488380be8cc89be4298b268902a.tar.xz | |
Automated merge with file:/home/stever/hg/m5-orig
--HG--
extra : convert_revision : 86a55cd98a9704f756a70aa0cbd2820cf92c821d
Diffstat (limited to 'src/cpu/o3/cpu.cc')
| -rw-r--r-- | src/cpu/o3/cpu.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc index 5908062aa..8eb17d23b 100644 --- a/src/cpu/o3/cpu.cc +++ b/src/cpu/o3/cpu.cc @@ -80,7 +80,7 @@ FullO3CPU<Impl>::TickEvent::process() template <class Impl> const char * -FullO3CPU<Impl>::TickEvent::description() +FullO3CPU<Impl>::TickEvent::description() const { return "FullO3CPU tick"; } @@ -109,7 +109,7 @@ FullO3CPU<Impl>::ActivateThreadEvent::process() template <class Impl> const char * -FullO3CPU<Impl>::ActivateThreadEvent::description() +FullO3CPU<Impl>::ActivateThreadEvent::description() const { return "FullO3CPU \"Activate Thread\""; } @@ -141,7 +141,7 @@ FullO3CPU<Impl>::DeallocateContextEvent::process() template <class Impl> const char * -FullO3CPU<Impl>::DeallocateContextEvent::description() +FullO3CPU<Impl>::DeallocateContextEvent::description() const { return "FullO3CPU \"Deallocate Context\""; } |