Revert "ring-buffer: Add unlikelys to make fast path the default"

This reverts commit ac4e03df07cba1d92e4555c577bc3179a10c6a72.

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 520ea0de7894ca16f2dca666857de9c75cc2d048..0315d43176d80d264c37f22ba403a5089a124c48 100644 (file)
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -2741,23 +2741,23 @@ ring_buffer_lock_reserve(struct ring_buffer *buffer, unsigned long length)
        /* If we are tracing schedule, we don't want to recurse */
        preempt_disable_notrace();
 
-       if (unlikely(atomic_read(&buffer->record_disabled)))
+       if (atomic_read(&buffer->record_disabled))
                goto out_nocheck;
 
-       if (unlikely(trace_recursive_lock()))
+       if (trace_recursive_lock())
                goto out_nocheck;
 
        cpu = raw_smp_processor_id();
 
-       if (unlikely(!cpumask_test_cpu(cpu, buffer->cpumask)))
+       if (!cpumask_test_cpu(cpu, buffer->cpumask))
                goto out;
 
        cpu_buffer = buffer->buffers[cpu];
 
-       if (unlikely(atomic_read(&cpu_buffer->record_disabled)))
+       if (atomic_read(&cpu_buffer->record_disabled))
                goto out;
 
-       if (unlikely(length > BUF_MAX_DATA_SIZE))
+       if (length > BUF_MAX_DATA_SIZE)
                goto out;
 
        event = rb_reserve_next_event(buffer, cpu_buffer, length);