Merge "sched, trace: Fix prev_state output in sched_switch tracepoint" (68e1cc7c) · Commits · e / devices / android_kernel_xiaomi_nabu

include/trace/events/sched.h

+11 −1

Original line number	Diff line number	Diff line
		@@ -155,6 +155,8 @@ DEFINE_EVENT(sched_wakeup_template, sched_wakeup_new,
		#ifdef CREATE_TRACE_POINTS
		static inline long __trace_sched_switch_state(bool preempt, struct task_struct *p)
		{
		unsigned int state;

		#ifdef CONFIG_SCHED_DEBUG
		BUG_ON(p != current);
		#endif /* CONFIG_SCHED_DEBUG */
		@@ -166,7 +168,15 @@ static inline long __trace_sched_switch_state(bool preempt, struct task_struct *
		if (preempt)
		return TASK_REPORT_MAX;

		return 1 << __get_task_state(p);
		/*
		* __get_task_state() uses fls(), which considers LSB as 0. So
		* Decrement it by 1 (except TASK_RUNNING state i.e 0) before using
		* it for left shift operation to get the correct task->state
		* mapping.
		*/
		state = __get_task_state(p);

		return state ? (1 << (state - 1)) : state;
		}
		#endif /* CREATE_TRACE_POINTS */