ftrace: fix __trace_special() (1a3c3034) · Commits · e / devices / android_kernel_teracube_emerald

include/linux/sched.h

+12 −8

Original line number	Original line	Diff line number	Diff line
	@@ -2119,6 +2119,18 @@ static inline void arch_pick_mmap_layout(struct mm_struct *mm)
	}		}
	#endif		#endif

			#ifdef CONFIG_TRACING
			extern void
			__trace_special(void __tr, void __data,
			unsigned long arg1, unsigned long arg2, unsigned long arg3);
			#else
			static inline void
			__trace_special(void __tr, void __data,
			unsigned long arg1, unsigned long arg2, unsigned long arg3)
			{
			}
			#endif

	#ifdef CONFIG_CONTEXT_SWITCH_TRACER		#ifdef CONFIG_CONTEXT_SWITCH_TRACER
	extern void		extern void
	ftrace_ctx_switch(void rq, struct task_struct prev, struct task_struct *next);		ftrace_ctx_switch(void rq, struct task_struct prev, struct task_struct *next);
	@@ -2126,9 +2138,6 @@ extern void
	ftrace_wake_up_task(void rq, struct task_struct wakee,		ftrace_wake_up_task(void rq, struct task_struct wakee,
	struct task_struct *curr);		struct task_struct *curr);
	extern void ftrace_all_fair_tasks(void __rq, void __tr, void *__data);		extern void ftrace_all_fair_tasks(void __rq, void __tr, void *__data);
	extern void
	__trace_special(void __tr, void __data,
	unsigned long arg1, unsigned long arg2, unsigned long arg3);
	#else		#else
	static inline void		static inline void
	ftrace_ctx_switch(void rq, struct task_struct prev, struct task_struct *next)		ftrace_ctx_switch(void rq, struct task_struct prev, struct task_struct *next)
	@@ -2146,11 +2155,6 @@ ftrace_wake_up_task(void rq, struct task_struct wakee,
	static inline void ftrace_all_fair_tasks(void __rq, void __tr, void *__data)		static inline void ftrace_all_fair_tasks(void __rq, void __tr, void *__data)
	{		{
	}		}
	static inline void
	__trace_special(void __tr, void __data,
	unsigned long arg1, unsigned long arg2, unsigned long arg3)
	{
	}
	#endif		#endif

	extern long sched_setaffinity(pid_t pid, const cpumask_t *new_mask);		extern long sched_setaffinity(pid_t pid, const cpumask_t *new_mask);

kernel/trace/trace.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -670,8 +670,6 @@ ftrace(struct trace_array tr, struct trace_array_cpu data,
	trace_function(tr, data, ip, parent_ip, flags);		trace_function(tr, data, ip, parent_ip, flags);
	}		}

	#ifdef CONFIG_CONTEXT_SWITCH_TRACER

	void		void
	__trace_special(void __tr, void __data,		__trace_special(void __tr, void __data,
	unsigned long arg1, unsigned long arg2, unsigned long arg3)		unsigned long arg1, unsigned long arg2, unsigned long arg3)
	@@ -693,8 +691,6 @@ __trace_special(void __tr, void __data,
	trace_wake_up();		trace_wake_up();
	}		}

	#endif

	void __trace_stack(struct trace_array *tr,		void __trace_stack(struct trace_array *tr,
	struct trace_array_cpu *data,		struct trace_array_cpu *data,
	unsigned long flags,		unsigned long flags,