Merge zizzer.eecs.umich.edu:/bk/newmem

into  doughnut.mwconnections.com:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : 3f17fc418ee5a30da2b08a515fb394cc8fcdd237

1 files changed, 3 insertions, 10 deletions

diff --git a/src/kern/linux/printk.cc b/src/kern/linux/printk.cc
index 0e9fd6620..866353e31 100644
--- a/src/kern/linux/printk.cc
+++ b/src/kern/linux/printk.cc
@@ -32,22 +32,18 @@
 #include <sys/types.h>
 #include <algorithm>
 
-#include "base/trace.hh"
 #include "arch/arguments.hh"
+#include "base/trace.hh"
+#include "kern/linux/printk.hh"
 
 using namespace std;
 
 
 void
-Printk(TheISA::Arguments args)
+Printk(stringstream &out, TheISA::Arguments args)
 {
-    std::ostream &out = Trace::output();
     char *p = (char *)args++;
 
-    ios::fmtflags saved_flags = out.flags();
-    char old_fill = out.fill();
-    int old_precision = out.precision();
-
     while (*p) {
         switch (*p) {
           case '%': {
@@ -258,8 +254,5 @@ Printk(TheISA::Arguments args)
         }
     }
 
-    out.flags(saved_flags);
-    out.fill(old_fill);
-    out.precision(old_precision);
 }