From 9375caa3f1ac8ff8fe5bcf3b7de1f51a20b6cd91 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 8 Nov 2006 08:25:37 -0500
Subject: Fix for slightly mangled merge.

--HG--
extra : convert_revision : 1dea04ca222dd423c3d462114bc1c65afa52825d
---
 src/arch/sparc/faults.hh | 5 +++--
 1 file 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) {;}
 };
 
 
-- 
cgit v1.2.3