summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-11-08 08:25:37 -0500
committerGabe Black <gblack@eecs.umich.edu>2006-11-08 08:25:37 -0500
commit9375caa3f1ac8ff8fe5bcf3b7de1f51a20b6cd91 (patch)
treeff8fcf1ed53f65aa3655c77c2934bb5312f19e9d
parentb82fa633bb9a9bf72b724dcf202985f37ab1d8b8 (diff)
downloadgem5-9375caa3f1ac8ff8fe5bcf3b7de1f51a20b6cd91.tar.xz
Fix for slightly mangled merge.
--HG-- extra : convert_revision : 1dea04ca222dd423c3d462114bc1c65afa52825d
-rw-r--r--src/arch/sparc/faults.hh5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/arch/sparc/faults.hh b/src/arch/sparc/faults.hh
index 677f8e77e..9cc7739d9 100644
--- a/src/arch/sparc/faults.hh
+++ b/src/arch/sparc/faults.hh
@@ -228,9 +228,10 @@ class FillNOther : public EnumeratedFault<FillNOther>
class TrapInstruction : public EnumeratedFault<TrapInstruction>
{
+
public:
- TrapInstruction(uint32_t n, uint64_t syscall) :
- EnumeratedFault<TrapInstruction>(n), syscall_num(syscall) {;}
+ TrapInstruction(uint32_t n) :
+ EnumeratedFault<TrapInstruction>(n) {;}
};