From patchwork Wed Jan 16 09:43:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Guittot X-Patchwork-Id: 155703 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp443542jaa; Wed, 16 Jan 2019 01:43:27 -0800 (PST) X-Google-Smtp-Source: ALg8bN54UVoiuB+Ek2MtLTT0JDNJgWA8OqOQ2XAUmc2QC0y0vWKs1ZFowdT/meHXfjqD8MfBK8Hc X-Received: by 2002:a62:29c3:: with SMTP id p186mr8953968pfp.117.1547631807746; Wed, 16 Jan 2019 01:43:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547631807; cv=none; d=google.com; s=arc-20160816; b=qxZznmpwrcEDul6q7xymRGzllfr95A+fCCYU9a0py1RahIw+wUD91bn4IwhoJmI6PA r7HP4+iO+D0bfCp2wEiMO2h6uQf5k7zWrVSIIjvw83037BzEEY6QStuNDEQc/xyVGTe3 D0fWT/Q/kJgaXProCA62Wf+/loUhrKE4iaG3EXE3Mtse956S+nbiqfrrfbDb9G2ruS9G nsB7u71QR+qCiNNp5mjgN2mdng7X0JbpjTzK6g1uhrS7SrQrhUB6dlduxfYRUF/D26EC 85B83Ercvd28UxOF6eC7NhMjmBL7H1vbn4f9SIno4U8tid5XTLAseaEsotSaSeWP/jrv 5Fpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=U3BNDRrIiDC9gX+eckawILhRIOf/eDTHG1vkELYvYtE=; b=W9BAahzaBqfTr44G1nC1BR7o3BDBlItuCEwZmUBOuM+6BzynGsPiRX3DqtoO05O02x hDnCPFa3wb+kRf+n9bxYwCAlBBPJOKbUPvxR7jENepE48B4dXDOM+3cSYSnZQAhgjwlo kg9tkcunqw0myfmubufKgnxiprKYYfrHnPTfLW6nDiU0VCiR9x6ewEQnCzZMqLoutE8A sNvYxbg9nSQNsy68DJy6I5Yb1BNTluTq14WjPbULce1Y7kuNIXXvqBwEm06EMVtAsJuS kU5GMFnnfsNs5zBF7edxYq9oKHbdVMnIq638P1osZUgbWO8ocBv31dbBEXTLXxVWVZ3d KhuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Wc/OT1Rq"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g7si5726105plt.212.2019.01.16.01.43.27; Wed, 16 Jan 2019 01:43:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Wc/OT1Rq"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391788AbfAPJn0 (ORCPT + 30 others); Wed, 16 Jan 2019 04:43:26 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:33794 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391771AbfAPJnY (ORCPT ); Wed, 16 Jan 2019 04:43:24 -0500 Received: by mail-wr1-f65.google.com with SMTP id j2so6164457wrw.1 for ; Wed, 16 Jan 2019 01:43:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=U3BNDRrIiDC9gX+eckawILhRIOf/eDTHG1vkELYvYtE=; b=Wc/OT1Rq9Z3sW5vUlpQ/umlnkUWXtuD2H+KzVh4GKumNG4/BFGDcD87QvGq8gl4Oa8 WztWfx0ma2sUnte08FjSNBLrHXOnS5uhZuzRzKKlL89Hr4orhwMsPH7s5uGiv9VOFQZ+ Ib+51fAQKrbrxRoH7EGlyAmpSfMO/LrwT9H0Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=U3BNDRrIiDC9gX+eckawILhRIOf/eDTHG1vkELYvYtE=; b=bCUt5wM9lyd4FYTu8zCM6NOKS5HIr0PMSQ5kKplvh59DLcev42chw4zAF59ohqKUAw xS9cjyK04kTMXVl3MDomLlZwX7HmOI56yDDyz1Ofwq/xGSDHnfYcQBddSSNIhI4AsUkv vxGegqg6VJ1l9/mWBQLowZqE2Xf9uU62Jw6/72leJbPfQKhSj+3WXjVSadknbCHR1Xry eD5V/jnjHY+fh7g3XmQ7mp6B3A/m417KoxxVSuIoZNM2D67yp4uKaK07rc2ZgwQ39CjM ZK6Ow2PzEGVHt84iDFZRfJVQwnztfRor0+fBgqrWsJmX0j790tqQilYv+HQ89USV+zeX sfcw== X-Gm-Message-State: AJcUukdzy14neBJz4JHZGTJQadonRlUWygP03dHcVjwQhez1QV7bwgee n7oDgV6kGk/m00L+fF0ZR1VELA== X-Received: by 2002:adf:8b4d:: with SMTP id v13mr6490941wra.282.1547631802479; Wed, 16 Jan 2019 01:43:22 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:f:6020:596d:a8c4:e914:fdde]) by smtp.gmail.com with ESMTPSA id k19sm115996304wre.5.2019.01.16.01.43.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Jan 2019 01:43:21 -0800 (PST) From: Vincent Guittot To: peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org Cc: rjw@rjwysocki.net, dietmar.eggemann@arm.com, Morten.Rasmussen@arm.com, patrick.bellasi@arm.com, pjt@google.com, bsegall@google.com, thara.gopinath@linaro.org, pkondeti@codeaurora.org, quentin.perret@arm.com, srinivas.pandruvada@linux.intel.com, Vincent Guittot Subject: [PATCH v8 1/3] sched/fair: move rq_of helper function Date: Wed, 16 Jan 2019 10:43:09 +0100 Message-Id: <1547631791-16018-2-git-send-email-vincent.guittot@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547631791-16018-1-git-send-email-vincent.guittot@linaro.org> References: <1547631791-16018-1-git-send-email-vincent.guittot@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move rq_of() helper function so it can be used in pelt.c Signed-off-by: Vincent Guittot --- kernel/sched/fair.c | 13 ------------- kernel/sched/sched.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 13 deletions(-) -- 2.7.4 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index ca46964..63b9151 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -248,13 +248,6 @@ const struct sched_class fair_sched_class; */ #ifdef CONFIG_FAIR_GROUP_SCHED - -/* cpu runqueue to which this cfs_rq is attached */ -static inline struct rq *rq_of(struct cfs_rq *cfs_rq) -{ - return cfs_rq->rq; -} - static inline struct task_struct *task_of(struct sched_entity *se) { SCHED_WARN_ON(!entity_is_task(se)); @@ -411,12 +404,6 @@ static inline struct task_struct *task_of(struct sched_entity *se) return container_of(se, struct task_struct, se); } -static inline struct rq *rq_of(struct cfs_rq *cfs_rq) -{ - return container_of(cfs_rq, struct rq, cfs); -} - - #define for_each_sched_entity(se) \ for (; se; se = NULL) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 0ba0892..fd1bad2 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -951,6 +951,22 @@ struct rq { #endif }; +#ifdef CONFIG_FAIR_GROUP_SCHED + +/* cpu runqueue to which this cfs_rq is attached */ +static inline struct rq *rq_of(struct cfs_rq *cfs_rq) +{ + return cfs_rq->rq; +} + +#else /* !CONFIG_FAIR_GROUP_SCHED */ + +static inline struct rq *rq_of(struct cfs_rq *cfs_rq) +{ + return container_of(cfs_rq, struct rq, cfs); +} +#endif + static inline int cpu_of(struct rq *rq) { #ifdef CONFIG_SMP