Merge zizzer:/bk/newmem

into  zazzer.eecs.umich.edu:/z/rdreslin/m5bk/head

--HG--
extra : convert_revision : 7d7380a6565cff32470bddadb0158fad897a5cf5

src/base/trace.cc

@@ -192,22 +192,20 @@ dumpStatus()
 
 
 // add a set of functions that can easily be invoked from gdb
-extern "C" {
+void
-    void
+setTraceFlag(const char *string)
-    setTraceFlag(const char *string)
+{
-    {
+    Trace::changeFlag(string, true);
-        Trace::changeFlag(string, true);
+}
-    }
 
-    void
+void
-    clearTraceFlag(const char *string)
+clearTraceFlag(const char *string)
-    {
+{
-        Trace::changeFlag(string, false);
+    Trace::changeFlag(string, false);
-    }
+}
 
-    void
+void
-    dumpTraceStatus()
+dumpTraceStatus()
-    {
+{
-        Trace::dumpStatus();
+    Trace::dumpStatus();
-    }
+}
-/* extern "C" */ }

src/cpu/pc_event.cc

@@ -138,14 +138,12 @@ BreakPCEvent::process(ThreadContext *tc)
 }
 
 #if FULL_SYSTEM
-extern "C"
 void
 sched_break_pc_sys(System *sys, Addr addr)
 {
     new BreakPCEvent(&sys->pcEventQueue, "debug break", addr, true);
 }
 
-extern "C"
 void
 sched_break_pc(Addr addr)
 {

src/sim/eventq.cc

@@ -222,7 +222,6 @@ EventQueue::dump()
     cprintf("============================================================\n");
 }
 
-extern "C"
 void
 dumpMainQueue()
 {