diff -r f746efa6e758 -r 0ce2675f3d5c src/kern/linux/printk.cc
--- a/src/kern/linux/printk.cc	Tue May 29 16:52:00 2012 +0100
+++ b/src/kern/linux/printk.cc	Tue May 29 16:55:04 2012 +0100
@@ -169,7 +169,7 @@
                   break;
 
                 case 's': {
-                    const char *s = (const char *)args;
+                    const char *s = (char *)args;
                     if (!s)
                         s = "<NULL>";
 
diff -r f746efa6e758 -r 0ce2675f3d5c src/sim/arguments.hh
--- a/src/sim/arguments.hh	Tue May 29 16:52:00 2012 +0100
+++ b/src/sim/arguments.hh	Tue May 29 16:55:04 2012 +0100
@@ -137,7 +137,7 @@
     template <class T>
     operator T *() {
         T *buf = (T *)data->alloc(sizeof(T));
-        CopyData(tc, buf, getArg(sizeof(T)), sizeof(T));
+        CopyOut(tc, buf, getArg(sizeof(T)), sizeof(T));
         return buf;
     }