kernel/timer.c: convert compat_sys_sysinfo to COMPAT_SYSCALL_DEFINE

[karo-tx-linux.git] / kernel / trace / trace_entries.h

diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h
index 4108e1250ca2c2b83e58a99c851c6506fe1348bb..e2d027ac66a2d0f79bc1b3959b028a081f1fbc5d 100644 (file)
--- a/kernel/trace/trace_entries.h
+++ b/kernel/trace/trace_entries.h
@@ -223,8 +223,8 @@ FTRACE_ENTRY(bprint, bprint_entry,
                __dynamic_array(        u32,    buf     )
        ),
 
-       F_printk("%08lx fmt:%p",
-                __entry->ip, __entry->fmt),
+       F_printk("%pf: %s",
+                (void *)__entry->ip, __entry->fmt),
 
        FILTER_OTHER
 );
@@ -238,8 +238,23 @@ FTRACE_ENTRY(print, print_entry,
                __dynamic_array(        char,   buf     )
        ),
 
-       F_printk("%08lx %s",
-                __entry->ip, __entry->buf),
+       F_printk("%pf: %s",
+                (void *)__entry->ip, __entry->buf),
+
+       FILTER_OTHER
+);
+
+FTRACE_ENTRY(bputs, bputs_entry,
+
+       TRACE_BPUTS,
+
+       F_STRUCT(
+               __field(        unsigned long,  ip      )
+               __field(        const char *,   str     )
+       ),
+
+       F_printk("%pf: %s",
+                (void *)__entry->ip, __entry->str),
 
        FILTER_OTHER
 );