| Message ID | 1539855372-11472-1-git-send-email-daniel.lezcano@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] sched/cpufreq: Reorganize the cpufreq files | expand |
On 18/10/2018 11:35, Daniel Lezcano wrote: > 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 <mingo@kernel.org> > Cc: Rafael J. Wysocki <rafael@kernel.org> > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- > kernel/sched/Makefile | 3 +-- > kernel/sched/{cpufreq.c => cpufreq/core.c} | 2 +- > kernel/sched/{cpufreq_schedutil.c => cpufreq/metrics.c} | 2 +- I forget to git add the cpufreq/Makefile, resending. -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
On Thu, Oct 18, 2018 at 11:54 AM Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > > On 18/10/2018 11:42, Rafael J. Wysocki wrote: > > On Thu, Oct 18, 2018 at 11:36 AM Daniel Lezcano > > <daniel.lezcano@linaro.org> wrote: > >> > >> 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 > > > > Fair enough, but do we need to do that right now? > > I'm not planning to do more code reorg than this patch right now. Up to > you to decide if you are willing to take them. The SPDX one certainly is applicable, but I'm not sure about the other one TBH. Why don't you add the SPDX IDs to those files as they are for now?
On 18/10/2018 12:06, Rafael J. Wysocki wrote: > On Thu, Oct 18, 2018 at 11:54 AM Daniel Lezcano > <daniel.lezcano@linaro.org> wrote: >> >> On 18/10/2018 11:42, Rafael J. Wysocki wrote: >>> On Thu, Oct 18, 2018 at 11:36 AM Daniel Lezcano >>> <daniel.lezcano@linaro.org> wrote: >>>> >>>> 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 >>> >>> Fair enough, but do we need to do that right now? >> >> I'm not planning to do more code reorg than this patch right now. Up to >> you to decide if you are willing to take them. > > The SPDX one certainly is applicable, but I'm not sure about the other one TBH. > > Why don't you add the SPDX IDs to those files as they are for now? Yes, sure. -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Hi Daniel,
I love your patch! Yet something to improve:
[auto build test ERROR on tip/sched/core]
[also build test ERROR on v4.19-rc8 next-20181018]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Daniel-Lezcano/sched-cpufreq-Reorganize-the-cpufreq-files/20181019-103851
config: x86_64-randconfig-s1-10191209 (attached as .config)
compiler: gcc-6 (Debian 6.4.0-9) 6.4.0 20171026
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
All errors (new ones prefixed by >>):
>> scripts/Makefile.build:45: kernel/sched/cpufreq/Makefile: No such file or directory
>> make[4]: *** No rule to make target 'kernel/sched/cpufreq/Makefile'.
make[4]: Failed to remake makefile 'kernel/sched/cpufreq/Makefile'.
vim +45 scripts/Makefile.build
0c53c8e6e Sam Ravnborg 2007-10-14 41
2a6914703 Sam Ravnborg 2005-07-25 42 # The filename Kbuild has precedence over Makefile
db8c1a7b2 Sam Ravnborg 2005-07-27 43 kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
0c53c8e6e Sam Ravnborg 2007-10-14 44 kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile)
0c53c8e6e Sam Ravnborg 2007-10-14 @45 include $(kbuild-file)
^1da177e4 Linus Torvalds 2005-04-16 46
:::::: The code at line 45 was first introduced by commit
:::::: 0c53c8e6eb456cde30f2305421c605713856abc8 kbuild: check for wrong use of CFLAGS
:::::: TO: Sam Ravnborg <sam@neptun.(none)>
:::::: CC: Sam Ravnborg <sam@neptun.(none)>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Hi Daniel,
I love your patch! Yet something to improve:
[auto build test ERROR on tip/sched/core]
[also build test ERROR on v4.19-rc8 next-20181018]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Daniel-Lezcano/sched-cpufreq-Reorganize-the-cpufreq-files/20181019-103851
config: x86_64-randconfig-s2-10191209 (attached as .config)
compiler: gcc-6 (Debian 6.4.0-9) 6.4.0 20171026
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
All errors (new ones prefixed by >>):
>> scripts/Makefile.modbuiltin:26: kernel/sched/cpufreq/Makefile: No such file or directory
make[4]: *** No rule to make target 'kernel/sched/cpufreq/Makefile'.
make[4]: Failed to remake makefile 'kernel/sched/cpufreq/Makefile'.
vim +26 scripts/Makefile.modbuiltin
607b30fc Michal Marek 2010-06-10 22
bc081dd6 Michal Marek 2009-12-07 23 # The filename Kbuild has precedence over Makefile
bc081dd6 Michal Marek 2009-12-07 24 kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
bc081dd6 Michal Marek 2009-12-07 25 kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile)
bc081dd6 Michal Marek 2009-12-07 @26 include $(kbuild-file)
bc081dd6 Michal Marek 2009-12-07 27
:::::: The code at line 26 was first introduced by commit
:::::: bc081dd6e9f622c73334dc465359168543ccaabf kbuild: generate modules.builtin
:::::: TO: Michal Marek <mmarek@suse.cz>
:::::: CC: Michal Marek <mmarek@suse.cz>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
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 <trace/events/power.h>
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 <mingo@kernel.org> Cc: Rafael J. Wysocki <rafael@kernel.org> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- 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