Merge ktlim@zizzer:/bk/newmem

into  zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem

--HG--
extra : convert_revision : 88fa7ae5cc32be068787ee381fae9d8de0e9bd0f

1 files changed, 6 insertions, 3 deletions

diff --git a/src/arch/sparc/regfile.cc b/src/arch/sparc/regfile.cc
index 747426781..5eb874d39 100644
--- a/src/arch/sparc/regfile.cc
+++ b/src/arch/sparc/regfile.cc
@@ -82,18 +82,21 @@ MiscReg RegFile::readMiscReg(int miscReg)
 MiscReg RegFile::readMiscRegWithEffect(int miscReg,
         Fault &fault, ThreadContext *tc)
 {
-    return miscRegFile.readRegWithEffect(miscReg, fault, tc);
+    fault = NoFault;
+    return miscRegFile.readRegWithEffect(miscReg, tc);
 }
 
 Fault RegFile::setMiscReg(int miscReg, const MiscReg &val)
 {
-    return miscRegFile.setReg(miscReg, val);
+    miscRegFile.setReg(miscReg, val);
+    return NoFault;
 }
 
 Fault RegFile::setMiscRegWithEffect(int miscReg, const MiscReg &val,
         ThreadContext * tc)
 {
-    return miscRegFile.setRegWithEffect(miscReg, val, tc);
+    miscRegFile.setRegWithEffect(miscReg, val, tc);
+    return NoFault;
 }
 
 FloatReg RegFile::readFloatReg(int floatReg, int width)