Commit 931da613 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/perf/core-2' of... 

Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
parents 5d67be97 1fd8df2c

arch/x86/kernel/stacktrace.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ void save_stack_trace(struct stack_trace *trace) 
}

EXPORT_SYMBOL_GPL(save_stack_trace);



void save_stack_trace_regs(struct stack_trace *trace, struct pt_regs *regs)

void save_stack_trace_regs(struct pt_regs *regs, struct stack_trace *trace)

{

	dump_trace(current, regs, NULL, 0, &save_stack_ops, trace);

	if (trace->nr_entries < trace->max_entries)

arch/x86/mm/kmemcheck/error.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ void kmemcheck_error_save(enum kmemcheck_shadow state, 
	e->trace.entries = e->trace_entries;

	e->trace.max_entries = ARRAY_SIZE(e->trace_entries);

	e->trace.skip = 0;

	save_stack_trace_regs(&e->trace, regs);

	save_stack_trace_regs(regs, &e->trace);



	/* Round address down to nearest 16 bytes */

	shadow_copy = kmemcheck_shadow_lookup(address

include/linux/ftrace_event.h

+4 −0
Original line number Diff line number Diff line
@@ -129,6 +129,10 @@ void trace_current_buffer_unlock_commit(struct ring_buffer *buffer, 
void trace_nowake_buffer_unlock_commit(struct ring_buffer *buffer,

				       struct ring_buffer_event *event,

					unsigned long flags, int pc);

void trace_nowake_buffer_unlock_commit_regs(struct ring_buffer *buffer,

					    struct ring_buffer_event *event,

					    unsigned long flags, int pc,

					    struct pt_regs *regs);

void trace_current_buffer_discard_commit(struct ring_buffer *buffer,

					 struct ring_buffer_event *event);

include/linux/ring_buffer.h

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ void ring_buffer_set_clock(struct ring_buffer *buffer, 
size_t ring_buffer_page_len(void *page);





void *ring_buffer_alloc_read_page(struct ring_buffer *buffer);

void *ring_buffer_alloc_read_page(struct ring_buffer *buffer, int cpu);

void ring_buffer_free_read_page(struct ring_buffer *buffer, void *data);

int ring_buffer_read_page(struct ring_buffer *buffer, void **data_page,

			  size_t len, int cpu, int full);

include/linux/stacktrace.h

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ struct stack_trace { 
};



extern void save_stack_trace(struct stack_trace *trace);

extern void save_stack_trace_regs(struct stack_trace *trace,

				  struct pt_regs *regs);

extern void save_stack_trace_regs(struct pt_regs *regs,

				  struct stack_trace *trace);

extern void save_stack_trace_tsk(struct task_struct *tsk,

				struct stack_trace *trace);

CRA Git | Maintained and supported by SUSTech CRA and CCSE