summaryrefslogtreecommitdiff
path: root/src/kern/linux/printk.cc
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-08-01 15:54:25 -0700
committerGabe Black <gblack@eecs.umich.edu>2007-08-01 15:54:25 -0700
commit458dfc8b3edc716a7587f3ad7516e6d667e0572e (patch)
tree5cafd01451dd3ea32269277af818a57c3e18ea2d /src/kern/linux/printk.cc
parentc032a535ab651f216ef0620915ab90338ca24929 (diff)
parent84cd78e96f892f52a715cfe10d9405987f5e9ba1 (diff)
downloadgem5-458dfc8b3edc716a7587f3ad7516e6d667e0572e.tar.xz
Merge with head.
--HG-- extra : convert_revision : f677debfd636d79bc5097eb45331601d3253743d
Diffstat (limited to 'src/kern/linux/printk.cc')
-rw-r--r--src/kern/linux/printk.cc4
1 files changed, 2 insertions, 2 deletions
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++;