Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

[~andy/linux] / kernel / trace / trace_printk.c

diff --git a/kernel/trace/trace_printk.c b/kernel/trace/trace_printk.c
index 7b627811082736e6cdb973b21f6f6ca5b623954f..2547d8813cf0535048162db1d986263a638f188a 100644 (file)
--- a/kernel/trace/trace_printk.c
+++ b/kernel/trace/trace_printk.c
@@ -11,7 +11,6 @@
 #include <linux/ftrace.h>
 #include <linux/string.h>
 #include <linux/module.h>
-#include <linux/marker.h>
 #include <linux/mutex.h>
 #include <linux/ctype.h>
 #include <linux/list.h>
@@ -176,7 +175,7 @@ static int t_show(struct seq_file *m, void *v)
        const char *str = *fmt;
        int i;
 
-       seq_printf(m, "0x%lx : \"", (unsigned long)fmt);
+       seq_printf(m, "0x%lx : \"", *(unsigned long *)fmt);
 
        /*
         * Tabs and new lines need to be converted.