From patchwork Thu Oct 18 09:35:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 149108 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp1737915lji; Thu, 18 Oct 2018 02:36:33 -0700 (PDT) X-Google-Smtp-Source: ACcGV62BF/+g/M3EiDaXwgalbX8wKBRT+aKiKK2qxphiw6UwK0a7lcagm70mmwtrQ8LY5qT0ndIy X-Received: by 2002:a63:de46:: with SMTP id y6-v6mr27688829pgi.198.1539855393246; Thu, 18 Oct 2018 02:36:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539855393; cv=none; d=google.com; s=arc-20160816; b=bdKT6/fOXrmGEfihrlNaWn+T4okZCPSJfVvtPE+XUuJC40txllmtqYysLE0nWXetwM HstyY+uN2JTflTqBK7vWy+fz0YDXP7Jq+Os6uyzKJCWTfbDAmNxXXp03jQoa6GPjHMFP eoLIz8gGnugaUJvsMrRF3eAjQDdhkOGm0b4nsRchzj4oLNo/3y0ImMC6grF/or2f6pZh lsEVjKPN2+f3vq+pSH5mslSeZz/FshJ2d7cErC/3leN+Tbs1loYZRUK0f3hKOWHopJxh FTnn0635l4gYHnyxVe+QMbFWhhBgeVz2rGgO8vxF8cjVgfd3bNocowX7DyYfgt7SvAAH r+yg== 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=xMYQ9kY4+9vkCjcMghg1qRg2z805eO3RerngQ9XZVKM=; b=hVgNa5WDMAED+kNA9utF82nOL+u4/y/xGR1Iwim5wbUNAYmaIE666hfxNdZ5P/nDyE CxWvK53+cX7E48x/HFCOhnHljEvo9dw2SP16kmDubI7fC1hBMLl2ypKr+8YnBdmowQUg fTLFbmHnd2Bc5HD+Ba9agIEECv9tz3+S3G7MNzvBQpWpKrC+C69N4x3+aQmJUChcemT/ ikoqkMB4Uusi7UEFWbPxQBl29hUHx7oX+0UiWIG7/IIbsCxBlFecrL4sAe4Z1slTu40O iw9UK9367TUL29xH2n7ATjuGvkjx3YnNs+PZdOwfp3IDoF1/YYcur1Ji70uVK5yYw1vZ wShQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PMTAB4Av; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 w19-v6si13843904pgf.197.2018.10.18.02.36.32; Thu, 18 Oct 2018 02:36:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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=PMTAB4Av; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 S1727799AbeJRRgl (ORCPT + 10 others); Thu, 18 Oct 2018 13:36:41 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:46277 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727363AbeJRRgl (ORCPT ); Thu, 18 Oct 2018 13:36:41 -0400 Received: by mail-wr1-f66.google.com with SMTP id n11-v6so32789339wru.13 for ; Thu, 18 Oct 2018 02:36:30 -0700 (PDT) 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=xMYQ9kY4+9vkCjcMghg1qRg2z805eO3RerngQ9XZVKM=; b=PMTAB4Av4/xscFhI1yMEIjKdAYn1VXnBYndTH/hlhO26qo23pTmSpgxqMZxzKpKULP 57yXLvVo9rNw5+1+AXrhIDOBJCyOCOytM0YljOzSd5rQOEieXiTrZ0yH79zlaepEPPPx suPzIk9gaS4jjJbqNbAJme/bwQgJcJDM0bm5w= 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=xMYQ9kY4+9vkCjcMghg1qRg2z805eO3RerngQ9XZVKM=; b=KGBCI0vz5z/CxrWXCDbQTnRkm54X074VvCR1pKGOTQxkburpgqx4cAuaBLS0JZHb9W hnQmV7ysACKF/bRSJ6CGgNcQqPSH7dwCcAgL6RhZb7mpJoEI5HqSV6fzCU1f9Pz3ExNj wzx+mpMFROd2SaPnPG14pnoe3udAKiMA1xs5F6r0wwwyUQlZV5ZQCORdUwzhY0JJxnvc 6EQFQUhw96cTRcBhqAE8GcZTzotbk5aSu0qlhTSydyI+CqWJSIuYxzQ1GgXAoE5mDY+u p+8PeUt44oBVu9Mrq+u31Ev9sCfoRV8pKUeHMTm1sytcc5cxGQ3kS7vEb/oxuGDDZYAN tRsA== X-Gm-Message-State: ABuFfogTZjfxXo2MIfIkw7Vzc5UcG9fFTihQsmQH1SpRYNTtkYelAhKi aQE3H9duK/yAW9PYrZr8nvBhkg== X-Received: by 2002:adf:f4c3:: with SMTP id h3-v6mr26496114wrp.259.1539855389737; Thu, 18 Oct 2018 02:36:29 -0700 (PDT) Received: from localhost.localdomain (77.65.136.77.rev.sfr.net. [77.136.65.77]) by smtp.gmail.com with ESMTPSA id 6-v6sm811323wrb.95.2018.10.18.02.36.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Oct 2018 02:36:28 -0700 (PDT) From: Daniel Lezcano To: rafael@kernel.org, mingo@kernel.org Cc: thara.gopinath@linaro.org, linux-kernel@vger.kernel.org, peterz@infradead.org, rui.zhang@intel.com, gregkh@linuxfoundation.org, viresh.kumar@linaro.org, amit.kachhap@gmail.com, javi.merino@kernel.org, edubezval@gmail.com, linux-pm@vger.kernel.org, quentin.perret@arm.com, ionela.voinescu@arm.com, vincent.guittot@linaro.org, Ingo Molnar , "Rafael J. Wysocki" , Juri Lelli , Patrick Bellasi Subject: [PATCH 1/2] sched/cpufreq: Reorganize the cpufreq files Date: Thu, 18 Oct 2018 11:35:58 +0200 Message-Id: <1539855372-11472-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org It was suggested to set the scene for the PM components in the scheduler code organization in the recent discussion about making the scheduler aware of the capacity capping from the thermal framework. Move the cpufreq files into its own directory as suggested at: https://lkml.org/lkml/2018/10/18/353 https://lkml.org/lkml/2018/10/18/408 Suggested-by: Ingo Molnar Cc: Rafael J. Wysocki Signed-off-by: Daniel Lezcano --- kernel/sched/Makefile | 3 +-- kernel/sched/{cpufreq.c => cpufreq/core.c} | 2 +- kernel/sched/{cpufreq_schedutil.c => cpufreq/metrics.c} | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) rename kernel/sched/{cpufreq.c => cpufreq/core.c} (99%) rename kernel/sched/{cpufreq_schedutil.c => cpufreq/metrics.c} (99%) -- 2.7.4 diff --git a/kernel/sched/Makefile b/kernel/sched/Makefile index 7fe1834..bc6bce0 100644 --- a/kernel/sched/Makefile +++ b/kernel/sched/Makefile @@ -19,13 +19,12 @@ endif obj-y += core.o loadavg.o clock.o cputime.o obj-y += idle.o fair.o rt.o deadline.o obj-y += wait.o wait_bit.o swait.o completion.o +obj-y += cpufreq/ obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o topology.o stop_task.o pelt.o obj-$(CONFIG_SCHED_AUTOGROUP) += autogroup.o obj-$(CONFIG_SCHEDSTATS) += stats.o obj-$(CONFIG_SCHED_DEBUG) += debug.o obj-$(CONFIG_CGROUP_CPUACCT) += cpuacct.o -obj-$(CONFIG_CPU_FREQ) += cpufreq.o -obj-$(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) += cpufreq_schedutil.o obj-$(CONFIG_MEMBARRIER) += membarrier.o obj-$(CONFIG_CPU_ISOLATION) += isolation.o diff --git a/kernel/sched/cpufreq.c b/kernel/sched/cpufreq/core.c similarity index 99% rename from kernel/sched/cpufreq.c rename to kernel/sched/cpufreq/core.c index 5e54cbc..8c17a63 100644 --- a/kernel/sched/cpufreq.c +++ b/kernel/sched/cpufreq/core.c @@ -8,7 +8,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include "sched.h" +#include "../sched.h" DEFINE_PER_CPU(struct update_util_data *, cpufreq_update_util_data); diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq/metrics.c similarity index 99% rename from kernel/sched/cpufreq_schedutil.c rename to kernel/sched/cpufreq/metrics.c index 3fffad3..597df47 100644 --- a/kernel/sched/cpufreq_schedutil.c +++ b/kernel/sched/cpufreq/metrics.c @@ -11,7 +11,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -#include "sched.h" +#include "../sched.h" #include