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

Commit 2a6f86bc 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:
  tracing: Fix trace_print_seq()
  kprobes: No need to unlock kprobe_insn_mutex
  tracing/fastboot: Document the need of initcall_debug
  trace_export: Repair missed fields
  tracing: Fix stack tracer sysctl handling
parents b690a377 e1af3aec

kernel/kprobes.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -237,13 +237,9 @@ static int __kprobes collect_garbage_slots(void) 
{

{

	struct kprobe_insn_page *kip;

	struct kprobe_insn_page *kip;

	struct hlist_node *pos, *next;

	struct hlist_node *pos, *next;

	int safety;





	/* Ensure no-one is preepmted on the garbages */

	/* Ensure no-one is preepmted on the garbages */

	mutex_unlock(&kprobe_insn_mutex);

	if (check_safety())

	safety = check_safety();

	mutex_lock(&kprobe_insn_mutex);

	if (safety != 0)

		return -EAGAIN;

		return -EAGAIN;





	hlist_for_each_entry_safe(kip, pos, next, &kprobe_insn_pages, hlist) {

	hlist_for_each_entry_safe(kip, pos, next, &kprobe_insn_pages, hlist) {

kernel/trace/Kconfig

+3 −3
Original line number Original line Diff line number Diff line
@@ -226,13 +226,13 @@ config BOOT_TRACER 
	  the timings of the initcalls and traces key events and the identity

	  the timings of the initcalls and traces key events and the identity

	  of tasks that can cause boot delays, such as context-switches.

	  of tasks that can cause boot delays, such as context-switches.





	  Its aim is to be parsed by the /scripts/bootgraph.pl tool to

	  Its aim is to be parsed by the scripts/bootgraph.pl tool to

	  produce pretty graphics about boot inefficiencies, giving a visual

	  produce pretty graphics about boot inefficiencies, giving a visual

	  representation of the delays during initcalls - but the raw

	  representation of the delays during initcalls - but the raw

	  /debug/tracing/trace text output is readable too.

	  /debug/tracing/trace text output is readable too.





	  You must pass in ftrace=initcall to the kernel command line

	  You must pass in initcall_debug and ftrace=initcall to the kernel

	  to enable this on bootup.

	  command line to enable this on bootup.





config TRACE_BRANCH_PROFILING

config TRACE_BRANCH_PROFILING

	bool

	bool

kernel/trace/ftrace.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -3160,10 +3160,10 @@ ftrace_enable_sysctl(struct ctl_table *table, int write, 




	ret  = proc_dointvec(table, write, file, buffer, lenp, ppos);

	ret  = proc_dointvec(table, write, file, buffer, lenp, ppos);





	if (ret || !write || (last_ftrace_enabled == ftrace_enabled))

	if (ret || !write || (last_ftrace_enabled == !!ftrace_enabled))

		goto out;

		goto out;





	last_ftrace_enabled = ftrace_enabled;

	last_ftrace_enabled = !!ftrace_enabled;





	if (ftrace_enabled) {

	if (ftrace_enabled) {

kernel/trace/trace_event_types.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,9 @@ TRACE_EVENT_FORMAT(funcgraph_exit, TRACE_GRAPH_RET, 
		   ftrace_graph_ret_entry, ignore,

		   ftrace_graph_ret_entry, ignore,

	TRACE_STRUCT(

	TRACE_STRUCT(

		TRACE_FIELD(unsigned long, ret.func, func)

		TRACE_FIELD(unsigned long, ret.func, func)

		TRACE_FIELD(unsigned long long, ret.calltime, calltime)

		TRACE_FIELD(unsigned long long, ret.rettime, rettime)

		TRACE_FIELD(unsigned long, ret.overrun, overrun)

		TRACE_FIELD(int, ret.depth, depth)

		TRACE_FIELD(int, ret.depth, depth)

	),

	),

	TP_RAW_FMT("<-- %lx (%d)")

	TP_RAW_FMT("<-- %lx (%d)")

kernel/trace/trace_output.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -27,8 +27,7 @@ void trace_print_seq(struct seq_file *m, struct trace_seq *s) 
{

{

	int len = s->len >= PAGE_SIZE ? PAGE_SIZE - 1 : s->len;

	int len = s->len >= PAGE_SIZE ? PAGE_SIZE - 1 : s->len;





	s->buffer[len] = 0;

	seq_write(m, s->buffer, len);

	seq_puts(m, s->buffer);





	trace_seq_init(s);

	trace_seq_init(s);

}

}