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

Commit 7928ddc7 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Revert "sched, trace: Fix prev_state output in sched_switch tracepoint" 



This reverts commit e1e5fa73.

This is a preparation change for merging android-4.14-p.102 into
msm-4.14 branch.

The reverted change is presented already into msm-4.14 via change:

20a4a25f sched, trace: Fix prev_state output in sched_switch tracepoint

Change-Id: I1e5a49dfa4c4c0a04f515ceb24e5a06c1f4b3502
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parent 6d248da0

include/trace/events/sched.h

+1 −11
Original line number Diff line number Diff line
@@ -107,8 +107,6 @@ 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 */
@@ -120,15 +118,7 @@ static inline long __trace_sched_switch_state(bool preempt, struct task_struct * 
	if (preempt)

		return TASK_REPORT_MAX;



	/*

	 * task_state_index() uses fls() and returns a value from 0-8 range.

	 * 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;

	return 1 << __get_task_state(p);

}

#endif /* CREATE_TRACE_POINTS */