Merge tag 'vfio-v5.12-rc1' of git://github.com/awilliam/linux-vfio

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

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 8fccee7..b9dad35 100644 (file)
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -2059,10 +2059,6 @@ int ring_buffer_resize(struct trace_buffer *buffer, unsigned long size,
 
                put_online_cpus();
        } else {
-               /* Make sure this CPU has been initialized */
-               if (!cpumask_test_cpu(cpu_id, buffer->cpumask))
-                       goto out;
-
                cpu_buffer = buffer->buffers[cpu_id];
 
                if (nr_pages == cpu_buffer->nr_pages)
@@ -2580,7 +2576,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
                         * have filled up the buffer with events
                         * from interrupts and such, and wrapped.
                         *
-                        * Note, if the tail page is also the on the
+                        * Note, if the tail page is also on the
                         * reader_page, we let it move out.
                         */
                        if (unlikely((cpu_buffer->commit_page !=