fix compiling problems

--HG--
extra : convert_revision : 9ecfd5a0a151c03503e42faf98240da12fd719b1

diff --git a/src/arch/mips/isa/formats/mem.isa b/src/arch/mips/isa/formats/mem.isa
index fccda2775207f6e2dd7eb849d72d07ccbc00f54c..c365edd0ac70fac2d9a3fc131ae8c3d18b45536c 100644 (file)
--- a/src/arch/mips/isa/formats/mem.isa
+++ b/src/arch/mips/isa/formats/mem.isa
@@ -449,7 +449,7 @@ def template StoreCondCompleteAcc {{
         %(fp_enable_check)s;
         %(op_dest_decl)s;
 
-        uint64_t write_result = pkt->req->getScResult();
+        uint64_t write_result = pkt->req->getExtraData();
 
         if (fault == NoFault) {
             %(postacc_code)s;

diff --git a/src/base/traceflags.py b/src/base/traceflags.py
index 335629467b1eebd48615d1d66f70815e8276087f..897bf00230ef684dd5125f8a352ac69eda0a0dc1 100644 (file)
--- a/src/base/traceflags.py
+++ b/src/base/traceflags.py
@@ -278,7 +278,7 @@ def gen_hh(filename):
     /* namespace Trace */ }
 
     #endif // __BASE_TRACE_FLAGS_HH__
-    ''',
+    \n''',
 
     hhfile.close()