From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24C1EC7657C for ; Thu, 27 Feb 2020 14:35:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E533724697 for ; Thu, 27 Feb 2020 14:35:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582814107; bh=0cRiHDjg/zFYOP3ScRzQ8pBy26vmofMa73wNOqpm/3I=; h=From:To:Subject:Date:In-Reply-To:References:In-Reply-To: References:List-ID:From; b=Nk/Q5M1GivxQgn47vcnYNUKpmwSOXQmama+Y2id4kIVSBccYXqg/51L8gyq8wo+Z6 BboFKpooSeJSNN+UEqFzlpU57bILFHLKceI1r/qbbr3r8P+xlCjo6ECAbgeSxwp49V H2m6xte9DlqDrzG+1dXTtJ2lrMG7yFHKBaWXp4mY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387832AbgB0OeL (ORCPT ); Thu, 27 Feb 2020 09:34:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:45042 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387559AbgB0OeD (ORCPT ); Thu, 27 Feb 2020 09:34:03 -0500 Received: from localhost.localdomain (c-98-220-238-81.hsd1.il.comcast.net [98.220.238.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F2CF8246B5; Thu, 27 Feb 2020 14:34:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582814042; bh=0cRiHDjg/zFYOP3ScRzQ8pBy26vmofMa73wNOqpm/3I=; h=From:To:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=dq/9tXPTXZKNhgRaSp+m31BmJwxWtgqxda59Ew4j22PHqixTtNxprSYUjlNG7dmQz tadkNnliJQGNcqCbzOiLHpW8gSa0VxDYuPHgfbT2EzBl0kgm3lQ6jurnEb6qoRzHNG ZAQZBInHqRNoS7VPS7OUclXXeAY+99298c2E/n4c= From: zanussi@kernel.org To: LKML , linux-rt-users , Steven Rostedt , Thomas Gleixner , Carsten Emde , John Kacur , Sebastian Andrzej Siewior , Daniel Wagner , Tom Zanussi Subject: [PATCH RT 07/23] sched: Remove dead __migrate_disabled() check Date: Thu, 27 Feb 2020 08:33:18 -0600 Message-Id: <20499dc2581f16f080d212e97721992565f57669.1582814004.git.zanussi@kernel.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Scott Wood v4.14.170-rt75-rc2 stable review patch. If anyone has any objections, please let me know. ----------- [ Upstream commit 14d9272d534ea91262e15db99443fc5995c7c016 ] This code was unreachable given the __migrate_disabled() branch to "out" immediately beforehand. Signed-off-by: Scott Wood Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Tom Zanussi Conflicts: kernel/sched/core.c --- kernel/sched/core.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 8d6badac9225..4708129e8df1 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1217,13 +1217,6 @@ static int __set_cpus_allowed_ptr(struct task_struct *p, if (cpumask_test_cpu(task_cpu(p), new_mask) || __migrate_disabled(p)) goto out; -#if defined(CONFIG_SMP) && defined(CONFIG_PREEMPT_RT_BASE) - if (__migrate_disabled(p)) { - p->migrate_disable_update = 1; - goto out; - } -#endif - if (task_running(rq, p) || p->state == TASK_WAKING) { struct migration_arg arg = { p, dest_cpu }; /* Need help from migration thread: drop lock and wait. */ -- 2.14.1