xfs: Increase the default size of the reserved blocks pool

[safe/jmp/linux-2.6] / kernel / trace / trace_entries.h

diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h
index c866d34..c16a08f 100644 (file)
--- a/kernel/trace/trace_entries.h
+++ b/kernel/trace/trace_entries.h
@@ -78,7 +78,7 @@ FTRACE_ENTRY(funcgraph_entry, ftrace_graph_ent_entry,
                __field_desc(   int,            graph_ent,      depth           )
        ),
 
-       F_printk("--> %lx (%d)", __entry->graph_ent.func, __entry->depth)
+       F_printk("--> %lx (%d)", __entry->func, __entry->depth)
 );
 
 /* Function return entry */
@@ -97,8 +97,8 @@ FTRACE_ENTRY(funcgraph_exit, ftrace_graph_ret_entry,
 
        F_printk("<-- %lx (%d) (start: %llx  end: %llx) over: %d",
                 __entry->func, __entry->depth,
-                __entry->calltime, __entry->rettim,
-                __entrty->depth)
+                __entry->calltime, __entry->rettime,
+                __entry->depth)
 );
 
 /*
@@ -116,15 +116,6 @@ FTRACE_ENTRY(funcgraph_exit, ftrace_graph_ret_entry,
        __field(        unsigned char,  next_state      )       \
        __field(        unsigned int,   next_cpu        )
 
-#if 0
-FTRACE_ENTRY_STRUCT_ONLY(ctx_switch_entry,
-
-       F_STRUCT(
-               FTRACE_CTX_FIELDS
-       )
-);
-#endif
-
 FTRACE_ENTRY(context_switch, ctx_switch_entry,
 
        TRACE_CTX,
@@ -133,7 +124,7 @@ FTRACE_ENTRY(context_switch, ctx_switch_entry,
                FTRACE_CTX_FIELDS
        ),
 
-       F_printk(b"%u:%u:%u  ==> %u:%u:%u [%03u]",
+       F_printk("%u:%u:%u  ==> %u:%u:%u [%03u]",
                 __entry->prev_pid, __entry->prev_prio, __entry->prev_state,
                 __entry->next_pid, __entry->next_prio, __entry->next_state,
                 __entry->next_cpu
@@ -257,8 +248,8 @@ FTRACE_ENTRY(mmiotrace_rw, trace_mmiotrace_rw,
                __field_desc(   unsigned char,  rw,     width   )
        ),
 
-       F_printk("%lx %lx %lx %d %lx %lx",
-                __entry->phs, __entry->value, __entry->pc,
+       F_printk("%lx %lx %lx %d %x %x",
+                (unsigned long)__entry->phys, __entry->value, __entry->pc,
                 __entry->map_id, __entry->opcode, __entry->width)
 );
 
@@ -275,8 +266,8 @@ FTRACE_ENTRY(mmiotrace_map, trace_mmiotrace_map,
                __field_desc(   unsigned char,  map,    opcode  )
        ),
 
-       F_printk("%lx %lx %lx %d %lx",
-                __entry->phs, __entry->virt, __entry->len,
+       F_printk("%lx %lx %lx %d %x",
+                (unsigned long)__entry->phys, __entry->virt, __entry->len,
                 __entry->map_id, __entry->opcode)
 );
 
@@ -339,23 +330,6 @@ FTRACE_ENTRY(hw_branch, hw_branch_entry,
        F_printk("from: %llx to: %llx", __entry->from, __entry->to)
 );
 
-FTRACE_ENTRY(power, trace_power,
-
-       TRACE_POWER,
-
-       F_STRUCT(
-               __field_struct( struct power_trace,     state_data      )
-               __field_desc(   s64,    state_data,     stamp           )
-               __field_desc(   s64,    state_data,     end             )
-               __field_desc(   int,    state_data,     type            )
-               __field_desc(   int,    state_data,     state           )
-       ),
-
-       F_printk("%llx->%llx type:%u state:%u",
-                __entry->stamp, __entry->end,
-                __entry->type, __entry->state)
-);
-
 FTRACE_ENTRY(kmem_alloc, kmemtrace_alloc_entry,
 
        TRACE_KMEM_ALLOC,
@@ -370,7 +344,7 @@ FTRACE_ENTRY(kmem_alloc, kmemtrace_alloc_entry,
                __field(        int,                    node            )
        ),
 
-       F_printk("type:%u call_site:%lx ptr:%p req:%lu alloc:%lu"
+       F_printk("type:%u call_site:%lx ptr:%p req:%zi alloc:%zi"
                 " flags:%x node:%d",
                 __entry->type_id, __entry->call_site, __entry->ptr,
                 __entry->bytes_req, __entry->bytes_alloc,
@@ -390,3 +364,19 @@ FTRACE_ENTRY(kmem_free, kmemtrace_free_entry,
        F_printk("type:%u call_site:%lx ptr:%p",
                 __entry->type_id, __entry->call_site, __entry->ptr)
 );
+
+FTRACE_ENTRY(ksym_trace, ksym_trace_entry,
+
+       TRACE_KSYM,
+
+       F_STRUCT(
+               __field(        unsigned long,  ip                        )
+               __field(        unsigned char,  type                      )
+               __array(        char         ,  cmd,       TASK_COMM_LEN  )
+               __field(        unsigned long,  addr                      )
+       ),
+
+       F_printk("ip: %pF type: %d ksym_name: %pS cmd: %s",
+               (void *)__entry->ip, (unsigned int)__entry->type,
+               (void *)__entry->addr,  __entry->cmd)
+);