Merge with head.

--HG--
extra : convert_revision : f677debfd636d79bc5097eb45331601d3253743d

3 files changed, 6 insertions, 6 deletions

diff --git a/src/kern/linux/events.cc b/src/kern/linux/events.cc
index 42fa63a27..bfff816ca 100644
--- a/src/kern/linux/events.cc
+++ b/src/kern/linux/events.cc
@@ -29,7 +29,7 @@
  *          Ali Saidi
  */
 
-#include "arch/arguments.hh"
+#include "sim/arguments.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/events.hh"
@@ -46,7 +46,7 @@ DebugPrintkEvent::process(ThreadContext *tc)
 {
     if (DTRACE(DebugPrintf)) {
         std::stringstream ss;
-        TheISA::Arguments args(tc);
+        Arguments args(tc);
         Printk(ss, args);
         StringWrap name(tc->getSystemPtr()->name() + ".dprintk");
         DPRINTFN("%s", ss.str());
diff --git a/src/kern/linux/printk.cc b/src/kern/linux/printk.cc
index 866353e31..24e28e666 100644
--- a/src/kern/linux/printk.cc
+++ b/src/kern/linux/printk.cc
@@ -32,7 +32,7 @@
 #include <sys/types.h>
 #include <algorithm>
 
-#include "arch/arguments.hh"
+#include "sim/arguments.hh"
 #include "base/trace.hh"
 #include "kern/linux/printk.hh"
 
@@ -40,7 +40,7 @@ using namespace std;
 
 
 void
-Printk(stringstream &out, TheISA::Arguments args)
+Printk(stringstream &out, Arguments args)
 {
     char *p = (char *)args++;
 
diff --git a/src/kern/linux/printk.hh b/src/kern/linux/printk.hh
index 20dfb430f..da9564b7e 100644
--- a/src/kern/linux/printk.hh
+++ b/src/kern/linux/printk.hh
@@ -36,8 +36,8 @@
 
 #include <sstream>
 
-class TheISA::Arguments;
+class Arguments;
 
-void Printk(std::stringstream &out, TheISA::Arguments args);
+void Printk(std::stringstream &out, Arguments args);
 
 #endif // __PRINTK_HH__