Merge branch 'tip/perf/urgent' of... (7c46d8da) · Commits · e / devices / android_kernel_teracube_2e

include/trace/events/module.h

+10 −0

Original line number	Diff line number	Diff line
		/*
		* Because linux/module.h has tracepoints in the header, and ftrace.h
		* eventually includes this file, define_trace.h includes linux/module.h
		* But we do not want the module.h to override the TRACE_SYSTEM macro
		* variable that define_trace.h is processing, so we only set it
		* when module events are being processed, which would happen when
		* CREATE_TRACE_POINTS is defined.
		*/
		#ifdef CREATE_TRACE_POINTS
		#undef TRACE_SYSTEM
		#define TRACE_SYSTEM module
		#endif

		#if !defined(_TRACE_MODULE_H) \|\| defined(TRACE_HEADER_MULTI_READ)
		#define _TRACE_MODULE_H

+12 −21

Original line number	Diff line number	Diff line
		@@ -23,9 +23,6 @@ static int syscall_exit_register(struct ftrace_event_call *event,
		static int syscall_enter_define_fields(struct ftrace_event_call *call);
		static int syscall_exit_define_fields(struct ftrace_event_call *call);

		/* All syscall exit events have the same fields */
		static LIST_HEAD(syscall_exit_fields);

		static struct list_head *
		syscall_get_enter_fields(struct ftrace_event_call *call)
		{
		@@ -34,12 +31,6 @@ syscall_get_enter_fields(struct ftrace_event_call *call)
		return &entry->enter_fields;
		}

		static struct list_head *
		syscall_get_exit_fields(struct ftrace_event_call *call)
		{
		return &syscall_exit_fields;
		}

		struct trace_event_functions enter_syscall_print_funcs = {
		.trace = print_syscall_enter,
		};
		@@ -60,7 +51,7 @@ struct ftrace_event_class event_class_syscall_exit = {
		.system = "syscalls",
		.reg = syscall_exit_register,
		.define_fields = syscall_exit_define_fields,
		.get_fields = syscall_get_exit_fields,
		.fields = LIST_HEAD_INIT(event_class_syscall_exit.fields),
		.raw_init = init_syscall_trace,
		};