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

Commit be8147e6 authored by Tim Blechmann's avatar Tim Blechmann Committed by Ingo Molnar
Browse files

Revert "sched, x86: Optimize branch hint in __switch_to()" 



This reverts commit a3a1de0c.

Commit 8ec6993d cleared the es
and ds selectors, so the original branch hints are correct now.
Therefore the branch hint doesn't need to be removed.

Signed-off-by: default avatarTim Blechmann <tim@klingt.org>
LKML-Reference: <4B16503A.8030508@klingt.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent bdddd296

arch/x86/kernel/process_64.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -406,10 +406,11 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) 
	 * This won't pick up thread selector changes, but I guess that is ok.

	 * This won't pick up thread selector changes, but I guess that is ok.

	 */

	 */

	savesegment(es, prev->es);

	savesegment(es, prev->es);

	if (next->es | prev->es)

	if (unlikely(next->es | prev->es))

		loadsegment(es, next->es);

		loadsegment(es, next->es);



	savesegment(ds, prev->ds);

	savesegment(ds, prev->ds);

	if (next->ds | prev->ds)

	if (unlikely(next->ds | prev->ds))

		loadsegment(ds, next->ds);

		loadsegment(ds, next->ds);