Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze

[~andy/linux] / kernel / trace / trace_entries.h

diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h
index 0c100958c642aa73f4aadcde6eb3eec6953cf1b4..ead3d724599d2d701b29014c1eb575529162d4f9 100644 (file)
--- a/kernel/trace/trace_entries.h
+++ b/kernel/trace/trace_entries.h
@@ -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,
@@ -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,