Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72cc129e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'tracing-fixes-for-linus' of... 

Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ftrace: Fix unmatched locking in ftrace_regex_write()
  ring-buffer: Synchronize resizing buffer with reader lock
parents 411094ac ed146b25

kernel/trace/ftrace.c

+3 −3
Original line number Diff line number Diff line
@@ -2222,15 +2222,15 @@ ftrace_regex_write(struct file *file, const char __user *ubuf, 
		ret = ftrace_process_regex(parser->buffer,

					   parser->idx, enable);

		if (ret)

			goto out;

			goto out_unlock;



		trace_parser_clear(parser);

	}



	ret = read;



out_unlock:

	mutex_unlock(&ftrace_regex_lock);

out:



	return ret;

}

kernel/trace/ring_buffer.c

+2 −0
Original line number Diff line number Diff line
@@ -1193,6 +1193,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned nr_pages) 
	atomic_inc(&cpu_buffer->record_disabled);

	synchronize_sched();



	spin_lock_irq(&cpu_buffer->reader_lock);

	rb_head_page_deactivate(cpu_buffer);



	for (i = 0; i < nr_pages; i++) {
@@ -1207,6 +1208,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned nr_pages) 
		return;



	rb_reset_cpu(cpu_buffer);

	spin_unlock_irq(&cpu_buffer->reader_lock);



	rb_check_pages(cpu_buffer);