From: Quentin Perret <quentin.perret@arm.com> To: edubezval@gmail.com, rui.zhang@intel.com, javi.merino@kernel.org, viresh.kumar@linaro.org, amit.kachhap@gmail.com, rjw@rjwysocki.net, will.deacon@arm.com, catalin.marinas@arm.com Cc: daniel.lezcano@linaro.org, dietmar.eggemann@arm.com, ionela.voinescu@arm.com, quentin.perret@arm.com, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, mka@chromium.org Subject: [PATCH v2 2/3] PM / EM: Expose perf domain struct Date: Wed, 17 Apr 2019 10:43:00 +0100 [thread overview] Message-ID: <20190417094301.17622-3-quentin.perret@arm.com> (raw) In-Reply-To: <20190417094301.17622-1-quentin.perret@arm.com> In the current state, the perf_domain struct is fully defined only when CONFIG_ENERGY_MODEL=y. Since we need to write code that compiles both with or without that option in the thermal framework, make sure to actually define the struct regardless of the config option. That allows to avoid using stubbed accessor functions all the time in code paths that use the EM. Signed-off-by: Quentin Perret <quentin.perret@arm.com> --- include/linux/energy_model.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/linux/energy_model.h b/include/linux/energy_model.h index aa027f7bcb3e..fb32b86a467d 100644 --- a/include/linux/energy_model.h +++ b/include/linux/energy_model.h @@ -9,7 +9,6 @@ #include <linux/sched/topology.h> #include <linux/types.h> -#ifdef CONFIG_ENERGY_MODEL /** * em_cap_state - Capacity state of a performance domain * @frequency: The CPU frequency in KHz, for consistency with CPUFreq @@ -40,6 +39,7 @@ struct em_perf_domain { unsigned long cpus[0]; }; +#ifdef CONFIG_ENERGY_MODEL #define EM_CPU_MAX_POWER 0xFFFF struct em_data_callback { @@ -160,7 +160,6 @@ static inline int em_pd_nr_cap_states(struct em_perf_domain *pd) } #else -struct em_perf_domain {}; struct em_data_callback {}; #define EM_DATA_CB(_active_power_cb) { } -- 2.21.0
next prev parent reply other threads:[~2019-04-17 9:43 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-17 9:42 [PATCH v2 0/3] Make IPA use PM_EM Quentin Perret 2019-04-17 9:42 ` [PATCH v2 1/3] arm64: defconfig: Enable CONFIG_ENERGY_MODEL Quentin Perret 2019-04-17 9:43 ` Quentin Perret [this message] 2019-04-17 9:43 ` [PATCH v2 3/3] thermal: cpu_cooling: Migrate to using the EM framework Quentin Perret 2019-04-18 3:53 ` Viresh Kumar 2019-04-18 8:04 ` Quentin Perret 2019-04-22 8:25 ` Viresh Kumar 2019-04-23 8:07 ` Quentin Perret 2019-04-23 8:35 ` Viresh Kumar
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190417094301.17622-3-quentin.perret@arm.com \ --to=quentin.perret@arm.com \ --cc=amit.kachhap@gmail.com \ --cc=catalin.marinas@arm.com \ --cc=daniel.lezcano@linaro.org \ --cc=dietmar.eggemann@arm.com \ --cc=edubezval@gmail.com \ --cc=ionela.voinescu@arm.com \ --cc=javi.merino@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=mka@chromium.org \ --cc=rjw@rjwysocki.net \ --cc=rui.zhang@intel.com \ --cc=viresh.kumar@linaro.org \ --cc=will.deacon@arm.com \ --subject='Re: [PATCH v2 2/3] PM / EM: Expose perf domain struct' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).