From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753997AbdBDLGx (ORCPT ); Sat, 4 Feb 2017 06:06:53 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:40510 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753811AbdBDLGv (ORCPT ); Sat, 4 Feb 2017 06:06:51 -0500 Date: Sat, 4 Feb 2017 12:06:45 +0100 From: Peter Zijlstra To: "Steven Rostedt (VMware)" Cc: LKML , Ingo Molnar , Andrew Morton , Oleg Nesterov , Vincent Guittot Subject: Re: [PATCH] sched: Update unlikely to now likely in sched_move_task() Message-ID: <20170204110645.GE6515@twins.programming.kicks-ass.net> References: <20170203153019.49b5b979@gandalf.local.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170203153019.49b5b979@gandalf.local.home> User-Agent: Mutt/1.5.23.1 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Feb 03, 2017 at 03:30:19PM -0500, Steven Rostedt (VMware) wrote: > diff --git a/kernel/sched/core.c b/kernel/sched/core.c > index c56fb57..669f23d 100644 > --- a/kernel/sched/core.c > +++ b/kernel/sched/core.c > @@ -7989,14 +7989,14 @@ void sched_move_task(struct task_struct *tsk) > > if (queued) > dequeue_task(rq, tsk, DEQUEUE_SAVE | DEQUEUE_MOVE); > - if (unlikely(running)) > + if (likely(running)) > put_prev_task(rq, tsk); > > sched_change_group(tsk, TASK_MOVE_GROUP); > > if (queued) > enqueue_task(rq, tsk, ENQUEUE_RESTORE | ENQUEUE_MOVE); > - if (unlikely(running)) > + if (likely(running)) > set_curr_task(rq, tsk); > > task_rq_unlock(rq, tsk, &rf); I prefer to simply remove the hint entirely and match all the other instances of this pattern. Now if only C wouldn't stink and have a sensible way to express this pattern without having to copy/paste it all over :/