Merge "trace: Fix race in trace_open and buffer resize call" (49ba4133) · Commits · e / devices / android_kernel_fairphone_FP4

kernel/trace/ring_buffer.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -4359,6 +4359,8 @@ void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu)

		if (!cpumask_test_cpu(cpu, buffer->cpumask))
		return;
		/* prevent another thread from changing buffer sizes */
		mutex_lock(&buffer->mutex);

		atomic_inc(&buffer->resize_disabled);
		atomic_inc(&cpu_buffer->record_disabled);
		@@ -4382,6 +4384,8 @@ void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu)

		atomic_dec(&cpu_buffer->record_disabled);
		atomic_dec(&buffer->resize_disabled);

		mutex_unlock(&buffer->mutex);
		}
		EXPORT_SYMBOL_GPL(ring_buffer_reset_cpu);