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

Commit 1bac0497 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tracing/core' of... 

Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core
parents 2c96c142 bf7c5b43

Documentation/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -778,6 +778,13 @@ and is between 256 and 4096 characters. It is defined in the file 
			by the set_ftrace_notrace file in the debugfs

			tracing directory.



	ftrace_graph_filter=[function-list]

			[FTRACE] Limit the top level callers functions traced

			by the function graph tracer at boot up.

			function-list is a comma separated list of functions

			that can be changed at run time by the

			set_graph_function file in the debugfs tracing directory.



	gamecon.map[2|3]=

			[HW,JOY] Multisystem joystick and NES/SNES/PSX pad

			support via parallel port (up to 5 devices per port)

kernel/trace/ftrace.c

+34 −0
Original line number Diff line number Diff line
@@ -78,6 +78,10 @@ ftrace_func_t ftrace_trace_function __read_mostly = ftrace_stub; 
ftrace_func_t __ftrace_trace_function __read_mostly = ftrace_stub;

ftrace_func_t ftrace_pid_function __read_mostly = ftrace_stub;



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

static int ftrace_set_func(unsigned long *array, int *idx, char *buffer);

#endif



static void ftrace_list_func(unsigned long ip, unsigned long parent_ip)

{

	struct ftrace_ops *op = ftrace_list;
@@ -2243,6 +2247,7 @@ void ftrace_set_notrace(unsigned char *buf, int len, int reset) 
#define FTRACE_FILTER_SIZE		COMMAND_LINE_SIZE

static char ftrace_notrace_buf[FTRACE_FILTER_SIZE] __initdata;

static char ftrace_filter_buf[FTRACE_FILTER_SIZE] __initdata;

static char ftrace_graph_buf[FTRACE_FILTER_SIZE] __initdata;



static int __init set_ftrace_notrace(char *str)

{
@@ -2258,6 +2263,31 @@ static int __init set_ftrace_filter(char *str) 
}

__setup("ftrace_filter=", set_ftrace_filter);



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

static int __init set_graph_function(char *str)

{

	strncpy(ftrace_graph_buf, str, FTRACE_FILTER_SIZE);

	return 1;

}

__setup("ftrace_graph_filter=", set_graph_function);



static void __init set_ftrace_early_graph(char *buf)

{

	int ret;

	char *func;



	while (buf) {

		func = strsep(&buf, ",");

		/* we allow only one expression at a time */

		ret = ftrace_set_func(ftrace_graph_funcs, &ftrace_graph_count,

				      func);

		if (ret)

			printk(KERN_DEBUG "ftrace: function %s not "

					  "traceable\n", func);

	}

}

#endif /* CONFIG_FUNCTION_GRAPH_TRACER */



static void __init set_ftrace_early_filter(char *buf, int enable)

{

	char *func;
@@ -2274,6 +2304,10 @@ static void __init set_ftrace_early_filters(void) 
		set_ftrace_early_filter(ftrace_filter_buf, 1);

	if (ftrace_notrace_buf[0])

		set_ftrace_early_filter(ftrace_notrace_buf, 0);

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

	if (ftrace_graph_buf[0])

		set_ftrace_early_graph(ftrace_graph_buf);

#endif /* CONFIG_FUNCTION_GRAPH_TRACER */

}



static int

kernel/trace/trace.c

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static int tracing_set_tracer(const char *buf); 
static char bootup_tracer_buf[MAX_TRACER_SIZE] __initdata;

static char *default_bootup_tracer;



static int __init set_ftrace(char *str)

static int __init set_bootup_ftrace(char *str)

{

	strncpy(bootup_tracer_buf, str, MAX_TRACER_SIZE);

	default_bootup_tracer = bootup_tracer_buf;
@@ -137,7 +137,7 @@ static int __init set_ftrace(char *str) 
	ring_buffer_expanded = 1;

	return 1;

}

__setup("ftrace=", set_ftrace);

__setup("ftrace=", set_bootup_ftrace);



static int __init set_ftrace_dump_on_oops(char *str)

{

kernel/trace/trace.h

+0 −4
Original line number Diff line number Diff line
@@ -483,10 +483,6 @@ static inline int ftrace_graph_addr(unsigned long addr) 
	return 0;

}

#else

static inline int ftrace_trace_addr(unsigned long addr)

{

	return 1;

}

static inline int ftrace_graph_addr(unsigned long addr)

{

	return 1;