Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	net/bridge/br_mdb.c

br_mdb.c conflict was a function call being removed to fix a bug in
'net' but whose signature was changed in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 7 deletions

diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
index a87b43f49eb4..e2e12ad3186f 100644
--- a/kernel/trace/trace_branch.c
+++ b/kernel/trace/trace_branch.c
@@ -36,9 +36,12 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)
         struct trace_branch *entry;
         struct ring_buffer *buffer;
         unsigned long flags;
-        int cpu, pc;
+        int pc;
         const char *p;
 
+        if (current->trace_recursion & TRACE_BRANCH_BIT)
+                return;
+
         /*
          * I would love to save just the ftrace_likely_data pointer, but
          * this code can also be used by modules. Ugly things can happen
@@ -49,10 +52,10 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)
         if (unlikely(!tr))
                 return;
 
-        local_irq_save(flags);
-        cpu = raw_smp_processor_id();
-        data = per_cpu_ptr(tr->trace_buffer.data, cpu);
-        if (atomic_inc_return(&data->disabled) != 1)
+        raw_local_irq_save(flags);
+        current->trace_recursion |= TRACE_BRANCH_BIT;
+        data = this_cpu_ptr(tr->trace_buffer.data);
+        if (atomic_read(&data->disabled))
                 goto out;
 
         pc = preempt_count();
@@ -81,8 +84,8 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)
                 __buffer_unlock_commit(buffer, event);
 
  out:
-        atomic_dec(&data->disabled);
-        local_irq_restore(flags);
+        current->trace_recursion &= ~TRACE_BRANCH_BIT;
+        raw_local_irq_restore(flags);
 }
 
 static inline