tracing: Merge irqflags + preempt counter.

[linux-2.6-microblaze.git] / kernel / trace / trace_branch.c

diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
index eff0991..e47fdb4 100644 (file)
--- a/kernel/trace/trace_branch.c
+++ b/kernel/trace/trace_branch.c
@@ -37,7 +37,7 @@ probe_likely_condition(struct ftrace_likely_data *f, int val, int expect)
        struct ring_buffer_event *event;
        struct trace_branch *entry;
        unsigned long flags;
-       int pc;
+       unsigned int trace_ctx;
        const char *p;
 
        if (current->trace_recursion & TRACE_BRANCH_BIT)
@@ -59,10 +59,10 @@ probe_likely_condition(struct ftrace_likely_data *f, int val, int expect)
        if (atomic_read(&data->disabled))
                goto out;
 
-       pc = preempt_count();
+       trace_ctx = tracing_gen_ctx_flags(flags);
        buffer = tr->array_buffer.buffer;
        event = trace_buffer_lock_reserve(buffer, TRACE_BRANCH,
-                                         sizeof(*entry), flags, pc);
+                                         sizeof(*entry), trace_ctx);
        if (!event)
                goto out;