Commit 31a05a41 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/core' of... 

Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
parents 82175633 eb878b3b

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5644,7 +5644,7 @@ TRACING 
M:	Steven Rostedt <rostedt@goodmis.org>

M:	Frederic Weisbecker <fweisbec@gmail.com>

M:	Ingo Molnar <mingo@redhat.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf/core

S:	Maintained

F:	Documentation/trace/ftrace.txt

F:	arch/*/*/*/ftrace.h

include/asm-generic/vmlinux.lds.h

+0 −4
Original line number Diff line number Diff line
@@ -150,10 +150,6 @@ 
	CPU_KEEP(exit.data)						\

	MEM_KEEP(init.data)						\

	MEM_KEEP(exit.data)						\

	. = ALIGN(8);							\

	VMLINUX_SYMBOL(__start___markers) = .;				\

	*(__markers)							\

	VMLINUX_SYMBOL(__stop___markers) = .;				\

	. = ALIGN(32);							\

	VMLINUX_SYMBOL(__start___tracepoints) = .;			\

	*(__tracepoints)						\

kernel/trace/Kconfig

+0 −22
Original line number Diff line number Diff line
@@ -308,28 +308,6 @@ config BRANCH_TRACER 


	  Say N if unsure.



config KSYM_TRACER

	bool "Trace read and write access on kernel memory locations"

	depends on HAVE_HW_BREAKPOINT

	select TRACING

	help

	  This tracer helps find read and write operations on any given kernel

	  symbol i.e. /proc/kallsyms.



config PROFILE_KSYM_TRACER

	bool "Profile all kernel memory accesses on 'watched' variables"

	depends on KSYM_TRACER

	help

	  This tracer profiles kernel accesses on variables watched through the

	  ksym tracer ftrace plugin. Depending upon the hardware, all read

	  and write operations on kernel variables can be monitored for

	  accesses.



	  The results will be displayed in:

	  /debugfs/tracing/profile_ksym



	  Say N if unsure.



config STACK_TRACER

	bool "Trace max stack"

	depends on HAVE_FUNCTION_TRACER

kernel/trace/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ obj-$(CONFIG_EVENT_TRACING) += trace_event_perf.o 
endif

obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o

obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o

obj-$(CONFIG_KSYM_TRACER) += trace_ksym.o

obj-$(CONFIG_EVENT_TRACING) += power-traces.o



libftrace-y := ftrace.o

kernel/trace/trace.h

+0 −6
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ enum trace_type { 
	TRACE_GRAPH_ENT,

	TRACE_USER_STACK,

	TRACE_BLK,

	TRACE_KSYM,



	__TRACE_LAST_TYPE,

};
@@ -200,7 +199,6 @@ extern void __ftrace_bad_type(void); 
			  TRACE_GRAPH_ENT);		\

		IF_ASSIGN(var, ent, struct ftrace_graph_ret_entry,	\

			  TRACE_GRAPH_RET);		\

		IF_ASSIGN(var, ent, struct ksym_trace_entry, TRACE_KSYM);\

		__ftrace_bad_type();					\

	} while (0)
@@ -361,8 +359,6 @@ int register_tracer(struct tracer *type); 
void unregister_tracer(struct tracer *type);

int is_tracing_stopped(void);



extern int process_new_ksym_entry(char *ksymname, int op, unsigned long addr);



extern unsigned long nsecs_to_usecs(unsigned long nsecs);



extern unsigned long tracing_thresh;
@@ -436,8 +432,6 @@ extern int trace_selftest_startup_sysprof(struct tracer *trace, 
					       struct trace_array *tr);

extern int trace_selftest_startup_branch(struct tracer *trace,

					 struct trace_array *tr);

extern int trace_selftest_startup_ksym(struct tracer *trace,

					 struct trace_array *tr);

#endif /* CONFIG_FTRACE_STARTUP_TEST */



extern void *head_page(struct trace_array_cpu *data);