From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 8 Nov 2006 13:25:37 +0000 (-0500)
Subject: Fix for slightly mangled merge.
X-Git-Tag: m5_2.0_beta2~53^2~12
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9375caa3f1ac8ff8fe5bcf3b7de1f51a20b6cd91;p=gem5.git

Fix for slightly mangled merge.

--HG--
extra : convert_revision : 1dea04ca222dd423c3d462114bc1c65afa52825d
---

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) {;}
 };