Merge tag 'pm-5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

[linux.git] / kernel / trace / trace_entries.h

diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h
index fc8e97328e540df40c3fdd5e534134431437a03f..3e9d816082843bcd02dac500933467a726f6a767 100644 (file)
--- a/kernel/trace/trace_entries.h
+++ b/kernel/trace/trace_entries.h
@@ -61,15 +61,13 @@ FTRACE_ENTRY_REG(function, ftrace_entry,
        TRACE_FN,
 
        F_STRUCT(
-               __field(        unsigned long,  ip              )
-               __field(        unsigned long,  parent_ip       )
+               __field_fn(     unsigned long,  ip              )
+               __field_fn(     unsigned long,  parent_ip       )
        ),
 
        F_printk(" %ps <-- %ps",
                 (void *)__entry->ip, (void *)__entry->parent_ip),
 
-       FILTER_TRACE_FN,
-
        perf_ftrace_event_register
 );
 
@@ -84,9 +82,7 @@ FTRACE_ENTRY_PACKED(funcgraph_entry, ftrace_graph_ent_entry,
                __field_desc(   int,            graph_ent,      depth           )
        ),
 
-       F_printk("--> %ps (%d)", (void *)__entry->func, __entry->depth),
-
-       FILTER_OTHER
+       F_printk("--> %ps (%d)", (void *)__entry->func, __entry->depth)
 );
 
 /* Function return entry */
@@ -97,18 +93,16 @@ FTRACE_ENTRY_PACKED(funcgraph_exit, ftrace_graph_ret_entry,
        F_STRUCT(
                __field_struct( struct ftrace_graph_ret,        ret     )
                __field_desc(   unsigned long,  ret,            func    )
+               __field_desc(   unsigned long,  ret,            overrun )
                __field_desc(   unsigned long long, ret,        calltime)
                __field_desc(   unsigned long long, ret,        rettime )
-               __field_desc(   unsigned long,  ret,            overrun )
                __field_desc(   int,            ret,            depth   )
        ),
 
        F_printk("<-- %ps (%d) (start: %llx  end: %llx) over: %d",
                 (void *)__entry->func, __entry->depth,
                 __entry->calltime, __entry->rettime,
-                __entry->depth),
-
-       FILTER_OTHER
+                __entry->depth)
 );
 
 /*
@@ -137,9 +131,7 @@ FTRACE_ENTRY(context_switch, ctx_switch_entry,
        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),
-
-       FILTER_OTHER
+                __entry->next_cpu)
 );
 
 /*
@@ -157,9 +149,7 @@ FTRACE_ENTRY_DUP(wakeup, ctx_switch_entry,
        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),
-
-       FILTER_OTHER
+                __entry->next_cpu)
 );
 
 /*
@@ -183,9 +173,7 @@ FTRACE_ENTRY(kernel_stack, stack_entry,
                 (void *)__entry->caller[0], (void *)__entry->caller[1],
                 (void *)__entry->caller[2], (void *)__entry->caller[3],
                 (void *)__entry->caller[4], (void *)__entry->caller[5],
-                (void *)__entry->caller[6], (void *)__entry->caller[7]),
-
-       FILTER_OTHER
+                (void *)__entry->caller[6], (void *)__entry->caller[7])
 );
 
 FTRACE_ENTRY(user_stack, userstack_entry,
@@ -203,9 +191,7 @@ FTRACE_ENTRY(user_stack, userstack_entry,
                 (void *)__entry->caller[0], (void *)__entry->caller[1],
                 (void *)__entry->caller[2], (void *)__entry->caller[3],
                 (void *)__entry->caller[4], (void *)__entry->caller[5],
-                (void *)__entry->caller[6], (void *)__entry->caller[7]),
-
-       FILTER_OTHER
+                (void *)__entry->caller[6], (void *)__entry->caller[7])
 );
 
 /*
@@ -222,9 +208,7 @@ FTRACE_ENTRY(bprint, bprint_entry,
        ),
 
        F_printk("%ps: %s",
-                (void *)__entry->ip, __entry->fmt),
-
-       FILTER_OTHER
+                (void *)__entry->ip, __entry->fmt)
 );
 
 FTRACE_ENTRY_REG(print, print_entry,
@@ -239,8 +223,6 @@ FTRACE_ENTRY_REG(print, print_entry,
        F_printk("%ps: %s",
                 (void *)__entry->ip, __entry->buf),
 
-       FILTER_OTHER,
-
        ftrace_event_register
 );
 
@@ -254,9 +236,7 @@ FTRACE_ENTRY(raw_data, raw_data_entry,
        ),
 
        F_printk("id:%04x %08x",
-                __entry->id, (int)__entry->buf[0]),
-
-       FILTER_OTHER
+                __entry->id, (int)__entry->buf[0])
 );
 
 FTRACE_ENTRY(bputs, bputs_entry,
@@ -269,9 +249,7 @@ FTRACE_ENTRY(bputs, bputs_entry,
        ),
 
        F_printk("%ps: %s",
-                (void *)__entry->ip, __entry->str),
-
-       FILTER_OTHER
+                (void *)__entry->ip, __entry->str)
 );
 
 FTRACE_ENTRY(mmiotrace_rw, trace_mmiotrace_rw,
@@ -283,16 +261,14 @@ FTRACE_ENTRY(mmiotrace_rw, trace_mmiotrace_rw,
                __field_desc(   resource_size_t, rw,    phys    )
                __field_desc(   unsigned long,  rw,     value   )
                __field_desc(   unsigned long,  rw,     pc      )
-               __field_desc(   int,            rw,     map_id  )
+               __field_desc(   int,            rw,     map_id  )
                __field_desc(   unsigned char,  rw,     opcode  )
                __field_desc(   unsigned char,  rw,     width   )
        ),
 
        F_printk("%lx %lx %lx %d %x %x",
                 (unsigned long)__entry->phys, __entry->value, __entry->pc,
-                __entry->map_id, __entry->opcode, __entry->width),
-
-       FILTER_OTHER
+                __entry->map_id, __entry->opcode, __entry->width)
 );
 
 FTRACE_ENTRY(mmiotrace_map, trace_mmiotrace_map,
@@ -304,15 +280,13 @@ FTRACE_ENTRY(mmiotrace_map, trace_mmiotrace_map,
                __field_desc(   resource_size_t, map,   phys    )
                __field_desc(   unsigned long,  map,    virt    )
                __field_desc(   unsigned long,  map,    len     )
-               __field_desc(   int,            map,    map_id  )
+               __field_desc(   int,            map,    map_id  )
                __field_desc(   unsigned char,  map,    opcode  )
        ),
 
        F_printk("%lx %lx %lx %d %x",
                 (unsigned long)__entry->phys, __entry->virt, __entry->len,
-                __entry->map_id, __entry->opcode),
-
-       FILTER_OTHER
+                __entry->map_id, __entry->opcode)
 );
 
 
@@ -334,9 +308,7 @@ FTRACE_ENTRY(branch, trace_branch,
        F_printk("%u:%s:%s (%u)%s",
                 __entry->line,
                 __entry->func, __entry->file, __entry->correct,
-                __entry->constant ? " CONSTANT" : ""),
-
-       FILTER_OTHER
+                __entry->constant ? " CONSTANT" : "")
 );
 
 
@@ -362,7 +334,5 @@ FTRACE_ENTRY(hwlat, hwlat_entry,
                 __entry->duration,
                 __entry->outer_duration,
                 __entry->nmi_total_ts,
-                __entry->nmi_count),
-
-       FILTER_OTHER
+                __entry->nmi_count)
 );