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

Commit b0b7065b 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: (24 commits)
  tracing/urgent: warn in case of ftrace_start_up inbalance
  tracing/urgent: fix unbalanced ftrace_start_up
  function-graph: add stack frame test
  function-graph: disable when both x86_32 and optimize for size are configured
  ring-buffer: have benchmark test print to trace buffer
  ring-buffer: do not grab locks in nmi
  ring-buffer: add locks around rb_per_cpu_empty
  ring-buffer: check for less than two in size allocation
  ring-buffer: remove useless compile check for buffer_page size
  ring-buffer: remove useless warn on check
  ring-buffer: use BUF_PAGE_HDR_SIZE in calculating index
  tracing: update sample event documentation
  tracing/filters: fix race between filter setting and module unload
  tracing/filters: free filter_string in destroy_preds()
  ring-buffer: use commit counters for commit pointer accounting
  ring-buffer: remove unused variable
  ring-buffer: have benchmark test handle discarded events
  ring-buffer: prevent adding write in discarded area
  tracing/filters: strloc should be unsigned short
  tracing/filters: operand can be negative
  ...

Fix up kmemcheck-induced conflict in kernel/trace/ring_buffer.c manually
parents 38df92b8 d4c40383

arch/powerpc/kernel/ftrace.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -586,7 +586,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) 
		return;

		return;

	}

	}





	if (ftrace_push_return_trace(old, self_addr, &trace.depth) == -EBUSY) {

	if (ftrace_push_return_trace(old, self_addr, &trace.depth, 0) == -EBUSY) {

		*parent = old;

		*parent = old;

		return;

		return;

	}

	}

arch/s390/kernel/ftrace.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -190,7 +190,7 @@ unsigned long prepare_ftrace_return(unsigned long ip, unsigned long parent) 
		goto out;

		goto out;

	if (unlikely(atomic_read(&current->tracing_graph_pause)))

	if (unlikely(atomic_read(&current->tracing_graph_pause)))

		goto out;

		goto out;

	if (ftrace_push_return_trace(parent, ip, &trace.depth) == -EBUSY)

	if (ftrace_push_return_trace(parent, ip, &trace.depth, 0) == -EBUSY)

		goto out;

		goto out;

	trace.func = ftrace_mcount_call_adjust(ip) & PSW_ADDR_INSN;

	trace.func = ftrace_mcount_call_adjust(ip) & PSW_ADDR_INSN;

	/* Only trace if the calling function expects to. */

	/* Only trace if the calling function expects to. */

arch/x86/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ config X86 
	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_GRAPH_FP_TEST

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE

	select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE

	select HAVE_FTRACE_SYSCALLS

	select HAVE_FTRACE_SYSCALLS

arch/x86/kernel/entry_32.S

+2 −0
Original line number Original line Diff line number Diff line
@@ -1174,6 +1174,7 @@ ENTRY(ftrace_graph_caller) 
	pushl %edx

	pushl %edx

	movl 0xc(%esp), %edx

	movl 0xc(%esp), %edx

	lea 0x4(%ebp), %eax

	lea 0x4(%ebp), %eax

	movl (%ebp), %ecx

	subl $MCOUNT_INSN_SIZE, %edx

	subl $MCOUNT_INSN_SIZE, %edx

	call prepare_ftrace_return

	call prepare_ftrace_return

	popl %edx

	popl %edx
@@ -1188,6 +1189,7 @@ return_to_handler: 
	pushl %eax

	pushl %eax

	pushl %ecx

	pushl %ecx

	pushl %edx

	pushl %edx

	movl %ebp, %eax

	call ftrace_return_to_handler

	call ftrace_return_to_handler

	movl %eax, 0xc(%esp)

	movl %eax, 0xc(%esp)

	popl %edx

	popl %edx

arch/x86/kernel/entry_64.S

+2 −0
Original line number Original line Diff line number Diff line
@@ -135,6 +135,7 @@ ENTRY(ftrace_graph_caller) 




	leaq 8(%rbp), %rdi

	leaq 8(%rbp), %rdi

	movq 0x38(%rsp), %rsi

	movq 0x38(%rsp), %rsi

	movq (%rbp), %rdx

	subq $MCOUNT_INSN_SIZE, %rsi

	subq $MCOUNT_INSN_SIZE, %rsi





	call	prepare_ftrace_return

	call	prepare_ftrace_return
@@ -150,6 +151,7 @@ GLOBAL(return_to_handler) 
	/* Save the return values */

	/* Save the return values */

	movq %rax, (%rsp)

	movq %rax, (%rsp)

	movq %rdx, 8(%rsp)

	movq %rdx, 8(%rsp)

	movq %rbp, %rdi





	call ftrace_return_to_handler

	call ftrace_return_to_handler