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

Commit f492d3f8 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/tracing/ftrace' of... 

Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
parents c4e2b432 e110e3d1

include/linux/ftrace.h

+40 −0
Original line number Diff line number Diff line
@@ -95,10 +95,41 @@ stack_trace_sysctl(struct ctl_table *table, int write, 
		   loff_t *ppos);

#endif



struct ftrace_func_command {

	struct list_head	list;

	char			*name;

	int			(*func)(char *func, char *cmd,

					char *params, int enable);

};



#ifdef CONFIG_DYNAMIC_FTRACE

/* asm/ftrace.h must be defined for archs supporting dynamic ftrace */

#include <asm/ftrace.h>



struct seq_file;



struct ftrace_hook_ops {

	void			(*func)(unsigned long ip,

					unsigned long parent_ip,

					void **data);

	int			(*callback)(unsigned long ip, void **data);

	void			(*free)(void **data);

	int			(*print)(struct seq_file *m,

					 unsigned long ip,

					 struct ftrace_hook_ops *ops,

					 void *data);

};



extern int

register_ftrace_function_hook(char *glob, struct ftrace_hook_ops *ops,

			      void *data);

extern void

unregister_ftrace_function_hook(char *glob, struct ftrace_hook_ops *ops,

				void *data);

extern void

unregister_ftrace_function_hook_func(char *glob, struct ftrace_hook_ops *ops);

extern void unregister_ftrace_function_hook_all(char *glob);



enum {

	FTRACE_FL_FREE		= (1 << 0),

	FTRACE_FL_FAILED	= (1 << 1),
@@ -119,6 +150,9 @@ struct dyn_ftrace { 
int ftrace_force_update(void);

void ftrace_set_filter(unsigned char *buf, int len, int reset);



int register_ftrace_command(struct ftrace_func_command *cmd);

int unregister_ftrace_command(struct ftrace_func_command *cmd);



/* defined in arch */

extern int ftrace_ip_converted(unsigned long ip);

extern int ftrace_dyn_arch_init(void *data);
@@ -202,6 +236,12 @@ extern void ftrace_enable_daemon(void); 
# define ftrace_disable_daemon()		do { } while (0)

# define ftrace_enable_daemon()			do { } while (0)

static inline void ftrace_release(void *start, unsigned long size) { }

static inline int register_ftrace_command(struct ftrace_func_command *cmd)

{

}

static inline int unregister_ftrace_command(char *cmd_name)

{

}

#endif /* CONFIG_DYNAMIC_FTRACE */



/* totally disable ftrace - can not re-enable after this */

include/linux/ring_buffer.h

+2 −0
Original line number Diff line number Diff line
@@ -128,10 +128,12 @@ void ring_buffer_normalize_time_stamp(int cpu, u64 *ts); 
void tracing_on(void);

void tracing_off(void);

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



void *ring_buffer_alloc_read_page(struct ring_buffer *buffer);