From patchwork Thu Oct 18 09:44:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 149110 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp1745638lji; Thu, 18 Oct 2018 02:45:17 -0700 (PDT) X-Google-Smtp-Source: ACcGV60vAsxX4hCouZUkrCDqQ78dy97tIkUv3lLYzCwcUJkTSNU71Gfa82gi10kGy23LCkKYkaXH X-Received: by 2002:a62:7788:: with SMTP id s130-v6mr29770158pfc.189.1539855917611; Thu, 18 Oct 2018 02:45:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539855917; cv=none; d=google.com; s=arc-20160816; b=a3ltE2u46gld3MevxplE5oASpJLrqti7ma1qL/xQRun/LOAskhudi/0bSLjhvuTPT1 3ut1unAPPT1JtritWm67lpG80zaOV8LWKoDsvf9x2X3Ng3Qzpe1y0djTpZzWR9ohwXXN AQD7JtIwSvQtfehe7YZ8p8c8QUOXGQ3aF6+64Kubo9H6HF2bvMkRPNSMk0CwDm2OSRq5 r1YK4JIJyI5R8a1yaN9+K639Ah9qrBKH9v35HMXEZgKCcINxMz4ALU8q6y8WDM/YE1p9 nkniyQNlre2LQZafO/nUGXmhyenHwyYEeiDixoHjSq7QSjUZ1MMmxOp1AcWY5hsWmvkF /MdA== 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=ML7BC+6djTXaiO8RLCoqQuER7nYUMEieYbNI6AwQsNM=; b=jYVyQy31rih0HU1BTaAQoTfzBTwuijjuFEPLe4OhypCUPFx2tWxVJWb8VVVmDz50/U K7pWLe4zDBa5dthC6lbdm4Rxb0wIZXXVAcpfSL6B6Y2owj2SI6YAzn8GeZJkgywo11ON jpQsja3FEaeiwClo22MGWg+Q54l3jCsFyR14140f0TLfR/L7fGqCgMxgVDZOfYM/FBYL z1X3HdIoD4tFWvKVD11xndxTNFd9WIZS3VJVfVrlf8YiM0lWXyt9u5SCSB7Z0ZPw40gc bGcZtZFNWhpOsLLfYQsSmB4QINDESF0EjXhk3plgSvvHckgaMz82vBpfYjb3WtiFyNgz 6PRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=c0yCzCep; 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 101-v6si22249224ple.326.2018.10.18.02.45.17; Thu, 18 Oct 2018 02:45:17 -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=c0yCzCep; 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 S1727653AbeJRRp2 (ORCPT + 10 others); Thu, 18 Oct 2018 13:45:28 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:40486 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727451AbeJRRp1 (ORCPT ); Thu, 18 Oct 2018 13:45:27 -0400 Received: by mail-wr1-f66.google.com with SMTP id d2-v6so32910371wro.7 for ; Thu, 18 Oct 2018 02:45:15 -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=ML7BC+6djTXaiO8RLCoqQuER7nYUMEieYbNI6AwQsNM=; b=c0yCzCepjoxWx7YcNmhbQu/ScnPLtkTaWmT8c9RtF3xAwQLm9r5ejfxXmQwio64eNt 1AW732GjuZJmStsdMwv6w6hPJHQys9AXNjMEsxYi05y+HCSHUShdZsZi+ywiGmD7mLYw r4mdZQNoWC0yolt5ldF2OkzyesDiWauLW5A1Y= 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=ML7BC+6djTXaiO8RLCoqQuER7nYUMEieYbNI6AwQsNM=; b=TLyboJiZWtMMRr3IBxjKO026TT20GP2WuqiX1oyLTEXUgOg5W/8ooEZcwc5p5NaOHK WUcM8OGqCxEWPbiWi+5xNneMqBWcWuccfaGKz6K6dOF6T3IEIby7R35z2vXdDnxM0MKB hOXOIxU+HQ7Op/GyMkpl/XiQSc7krHH6+AFMgHuR/AzouP0N6zXv4KeHqEIghifwJY54 cDACwVq72ViTcAy1l3KwwOPsAhO0mO+GxpdU+m0TMwiDcFtOYzKhe26pQWsyzUrpa05k TgReiF6HuK62643oua8r0sa41tAPTprGzXCefuWJOGnIku468jDeRJkG/5OX6PZEuhW/ Xn2A== X-Gm-Message-State: ABuFfohmBgTXWuMcHMVe4gym35IXZqbAnouhuQgmfONAtNtZpXAgB137 8LbALveGfSgenRkzj3DEVKJEKw== X-Received: by 2002:adf:a201:: with SMTP id p1-v6mr27743114wra.89.1539855914405; Thu, 18 Oct 2018 02:45:14 -0700 (PDT) Received: from localhost.localdomain (77.65.136.77.rev.sfr.net. [77.136.65.77]) by smtp.gmail.com with ESMTPSA id 195-v6sm4321756wmx.21.2018.10.18.02.45.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Oct 2018 02:45:13 -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 V2 1/2] sched/cpufreq: Reorganize the cpufreq files Date: Thu, 18 Oct 2018 11:44:14 +0200 Message-Id: <1539855869-13524-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 --- Changelog: * git added the Makefile in cpufreq/Makefile (V2) Signed-off-by: Daniel Lezcano --- kernel/sched/Makefile | 3 +-- kernel/sched/cpufreq/Makefile | 3 +++ kernel/sched/{cpufreq.c => cpufreq/core.c} | 2 +- kernel/sched/{cpufreq_schedutil.c => cpufreq/metrics.c} | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 kernel/sched/cpufreq/Makefile 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/Makefile b/kernel/sched/cpufreq/Makefile new file mode 100644 index 0000000..4bf1087 --- /dev/null +++ b/kernel/sched/cpufreq/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_CPU_FREQ) += core.o +obj-$(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) += metrics.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