summaryrefslogtreecommitdiff
path: root/src/cpu/o3/commit_impl.hh
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2007-07-15 23:22:04 -0400
committerSteve Reinhardt <stever@eecs.umich.edu>2007-07-15 23:22:04 -0400
commitd5bb145590a16165c362c6157801b7fbab4a0486 (patch)
treedaae998c411bace2532ca75f452c768cf306142c /src/cpu/o3/commit_impl.hh
parent658eeee50715d9fd334ae3fd3e0e21b6db6de0c4 (diff)
parent884807a68ad7e4f390660b3becfe4ee094334e95 (diff)
downloadgem5-d5bb145590a16165c362c6157801b7fbab4a0486.tar.xz
Merge from head.
--HG-- extra : convert_revision : c5d045208e521f0bc9e47484a380917e27066798
Diffstat (limited to 'src/cpu/o3/commit_impl.hh')
-rw-r--r--src/cpu/o3/commit_impl.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh
index 9411c6c62..f263383ae 100644
--- a/src/cpu/o3/commit_impl.hh
+++ b/src/cpu/o3/commit_impl.hh
@@ -67,7 +67,7 @@ template <class Impl>
const char *
DefaultCommit<Impl>::TrapEvent::description()
{
- return "Trap event";
+ return "Trap";
}
template <class Impl>