syscall: Resolve conflicts between m5threads and Gabe's recent SE changes.

2 files changed, 4 insertions, 4 deletions

diff --git a/src/arch/mips/isa_traits.hh b/src/arch/mips/isa_traits.hh
index 59c2c00a2..fb46890c1 100644
--- a/src/arch/mips/isa_traits.hh
+++ b/src/arch/mips/isa_traits.hh
@@ -188,6 +188,10 @@ namespace MipsISA
     // semantically meaningful register indices
     const int ZeroReg = 0;
     const int AssemblerReg = 1;
+    const int SyscallSuccessReg = 7;
+    const int FirstArgumentReg = 4;
+    const int ReturnValueReg = 2;
+
     const int KernelReg0 = 26;
     const int KernelReg1 = 27;
     const int GlobalPointerReg = 28;
diff --git a/src/arch/mips/process.cc b/src/arch/mips/process.cc
index 784ddfe33..3e9fb7c20 100644
--- a/src/arch/mips/process.cc
+++ b/src/arch/mips/process.cc
@@ -40,10 +40,6 @@
 using namespace std;
 using namespace MipsISA;
 
-static const int SyscallSuccessReg = 7;
-static const int FirstArgumentReg = 4;
-static const int ReturnValueReg = 2;
-
 MipsLiveProcess::MipsLiveProcess(LiveProcessParams * params,
         ObjectFile *objFile)
     : LiveProcess(params, objFile)