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

Commit 6605f9ac authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent
parents ad2a8e60 93d68e52

include/linux/ftrace_event.h

+2 −0
Original line number Diff line number Diff line
@@ -144,12 +144,14 @@ struct event_filter; 
enum trace_reg {

	TRACE_REG_REGISTER,

	TRACE_REG_UNREGISTER,

#ifdef CONFIG_PERF_EVENTS

	TRACE_REG_PERF_REGISTER,

	TRACE_REG_PERF_UNREGISTER,

	TRACE_REG_PERF_OPEN,

	TRACE_REG_PERF_CLOSE,

	TRACE_REG_PERF_ADD,

	TRACE_REG_PERF_DEL,

#endif

};



struct ftrace_event_call;

include/linux/kernel.h

+9 −6
Original line number Diff line number Diff line
@@ -427,16 +427,10 @@ extern int __must_check hex2bin(u8 *dst, const char *src, size_t count); 
 * Most likely, you want to use tracing_on/tracing_off.

 */

#ifdef CONFIG_RING_BUFFER

void tracing_on(void);

void tracing_off(void);

/* trace_off_permanent stops recording with no way to bring it back */

void tracing_off_permanent(void);

int tracing_is_on(void);

#else

static inline void tracing_on(void) { }

static inline void tracing_off(void) { }

static inline void tracing_off_permanent(void) { }

static inline int tracing_is_on(void) { return 0; }

#endif



enum ftrace_dump_mode {
@@ -446,6 +440,10 @@ enum ftrace_dump_mode { 
};



#ifdef CONFIG_TRACING

void tracing_on(void);

void tracing_off(void);

int tracing_is_on(void);



extern void tracing_start(void);

extern void tracing_stop(void);

extern void ftrace_off_permanent(void);
@@ -530,6 +528,11 @@ static inline void tracing_start(void) { } 
static inline void tracing_stop(void) { }

static inline void ftrace_off_permanent(void) { }

static inline void trace_dump_stack(void) { }



static inline void tracing_on(void) { }

static inline void tracing_off(void) { }

static inline int tracing_is_on(void) { return 0; }



static inline int

trace_printk(const char *fmt, ...)

{

include/linux/ring_buffer.h

+3 −0
Original line number Diff line number Diff line
@@ -151,6 +151,9 @@ int ring_buffer_empty_cpu(struct ring_buffer *buffer, int cpu); 


void ring_buffer_record_disable(struct ring_buffer *buffer);

void ring_buffer_record_enable(struct ring_buffer *buffer);

void ring_buffer_record_off(struct ring_buffer *buffer);

void ring_buffer_record_on(struct ring_buffer *buffer);

int ring_buffer_record_is_on(struct ring_buffer *buffer);

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

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

kernel/trace/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ if FTRACE 
config FUNCTION_TRACER

	bool "Kernel Function Tracer"

	depends on HAVE_FUNCTION_TRACER

	select FRAME_POINTER if !ARM_UNWIND && !S390 && !MICROBLAZE

	select FRAME_POINTER if !ARM_UNWIND && !PPC && !S390 && !MICROBLAZE

	select KALLSYMS

	select GENERIC_TRACER

	select CONTEXT_SWITCH_TRACER

kernel/trace/ftrace.c

+2 −1
Original line number Diff line number Diff line
@@ -249,7 +249,8 @@ static void update_ftrace_function(void) 
#else

	__ftrace_trace_function = func;

#endif

	ftrace_trace_function = ftrace_test_stop_func;

	ftrace_trace_function =

		(func == ftrace_stub) ? func : ftrace_test_stop_func;

#endif

}