From: Viresh Kumar <viresh.kumar@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the pm tree
Date: Mon, 1 Jul 2019 13:18:47 +0530 [thread overview]
Message-ID: <20190701074847.onx6irxbhkc5hbp3@vireshk-i7> (raw)
In-Reply-To: <20190701133715.702d4b57@canb.auug.org.au>
On 01-07-19, 13:37, Stephen Rothwell wrote:
> In file included from drivers/cpufreq/intel_pstate.c:11:
> drivers/cpufreq/intel_pstate.c: In function 'intel_pstate_update_max_freq':
> drivers/cpufreq/intel_pstate.c:912:31: error: 'struct cpufreq_policy' has no member named 'user_policy'; did you mean 'last_policy'?
> new_policy.max = min(policy->user_policy.max, policy->cpuinfo.max_freq);
^~~~~~~~~~~
Yeah, that was a recent update and I missed this path completely.
> Caused by commit
>
> 218208538ffe ("cpufreq: Add QoS requests for userspace constraints")
@Rafael: I hope merging below to this commit would be the right thing to do ?
--
viresh
-------------------------8<-------------------------
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 9da4dc33b716..99bcdb6d4d83 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1105,7 +1105,7 @@ static int cpufreq_add_policy_cpu(struct cpufreq_policy *policy, unsigned int cp
return ret;
}
-static void refresh_frequency_limits(struct cpufreq_policy *policy)
+void refresh_frequency_limits(struct cpufreq_policy *policy)
{
struct cpufreq_policy new_policy;
@@ -1120,6 +1120,7 @@ static void refresh_frequency_limits(struct cpufreq_policy *policy)
up_write(&policy->rwsem);
}
+EXPORT_SYMBOL(refresh_frequency_limits);
static void handle_update(struct work_struct *work)
{
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index f2ff5de988c1..cc27d4c59dca 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -898,7 +898,6 @@ static void intel_pstate_update_policies(void)
static void intel_pstate_update_max_freq(unsigned int cpu)
{
struct cpufreq_policy *policy = cpufreq_cpu_acquire(cpu);
- struct cpufreq_policy new_policy;
struct cpudata *cpudata;
if (!policy)
@@ -908,11 +907,7 @@ static void intel_pstate_update_max_freq(unsigned int cpu)
policy->cpuinfo.max_freq = global.turbo_disabled_mf ?
cpudata->pstate.max_freq : cpudata->pstate.turbo_freq;
- memcpy(&new_policy, policy, sizeof(*policy));
- new_policy.max = min(policy->user_policy.max, policy->cpuinfo.max_freq);
- new_policy.min = min(policy->user_policy.min, new_policy.max);
-
- cpufreq_set_policy(policy, &new_policy);
+ refresh_frequency_limits(policy);
cpufreq_cpu_release(policy);
}
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index dca2ae358542..d757a56a74dc 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -200,6 +200,7 @@ void cpufreq_cpu_release(struct cpufreq_policy *policy);
int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu);
int cpufreq_set_policy(struct cpufreq_policy *policy,
struct cpufreq_policy *new_policy);
+void refresh_frequency_limits(struct cpufreq_policy *policy);
void cpufreq_update_policy(unsigned int cpu);
void cpufreq_update_limits(unsigned int cpu);
bool have_governor_per_policy(void);
next prev parent reply other threads:[~2019-07-01 7:48 UTC|newest]
Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-01 3:37 linux-next: build failure after merge of the pm tree Stephen Rothwell
2019-07-01 7:48 ` Viresh Kumar [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-02-08 3:42 Stephen Rothwell
2024-01-24 0:51 Stephen Rothwell
2024-01-24 15:56 ` Wysocki, Rafael J
2023-12-18 23:37 Stephen Rothwell
2023-11-21 2:46 Stephen Rothwell
2023-07-14 1:00 Stephen Rothwell
2023-07-14 18:19 ` Wysocki, Rafael J
2023-07-14 18:50 ` Rafael J. Wysocki
2023-04-03 10:18 Stephen Rothwell
2023-04-03 1:25 Stephen Rothwell
2023-04-03 1:16 Stephen Rothwell
2023-04-03 1:06 Stephen Rothwell
2022-06-29 0:23 Stephen Rothwell
2022-06-29 13:01 ` Rafael J. Wysocki
2022-04-28 1:00 Stephen Rothwell
2022-04-28 3:07 ` Zhang Rui
2022-04-28 8:53 ` Zhang Rui
2022-04-28 8:56 ` Zhang Rui
2022-04-28 12:32 ` Rafael J. Wysocki
2022-01-04 0:15 Stephen Rothwell
2022-01-04 7:29 ` Heiner Kallweit
2022-01-04 8:02 ` Stephen Rothwell
2022-01-04 14:43 ` Heiner Kallweit
2022-01-04 14:57 ` Rafael J. Wysocki
2021-12-01 23:28 Stephen Rothwell
2021-12-02 10:04 ` Daniel Lezcano
2021-12-03 16:50 ` Rafael J. Wysocki
2021-12-03 17:22 ` Daniel Lezcano
2021-02-05 0:51 Stephen Rothwell
[not found] ` <CAHp75VfiyAtxg+wqZ30kSzCfFFsLndLjzrUc1njZG0x6vQeyBQ@mail.gmail.com>
2021-02-05 11:15 ` Andy Shevchenko
2021-02-08 19:30 ` Rafael J. Wysocki
2021-02-08 19:47 ` Andy Shevchenko
2021-02-08 19:48 ` Andy Shevchenko
2021-02-09 14:32 ` Rafael J. Wysocki
2021-02-09 16:04 ` Andy Shevchenko
2020-12-09 9:57 Stephen Rothwell
2020-03-17 7:52 Stephen Rothwell
2020-03-18 11:44 ` Stephen Rothwell
2020-03-18 11:52 ` Colin Ian King
2020-03-18 12:18 ` Stephen Rothwell
2020-03-19 5:42 ` Stephen Rothwell
2020-03-19 9:32 ` Rafael J. Wysocki
2019-07-31 5:34 Stephen Rothwell
2019-07-31 10:27 ` Rafael J. Wysocki
2019-07-15 0:02 Stephen Rothwell
2019-07-15 9:44 ` Rafael J. Wysocki
2019-07-04 9:41 Stephen Rothwell
2019-07-04 9:48 ` Viresh Kumar
2019-07-04 10:33 ` Rafael J. Wysocki
2018-05-24 14:16 Mark Brown
2016-09-14 4:27 Stephen Rothwell
2016-09-14 21:38 ` Rafael J. Wysocki
2016-07-22 1:56 Stephen Rothwell
2016-07-22 2:26 ` Steve Muckle
2016-07-22 12:08 ` Rafael J. Wysocki
2016-07-22 12:16 ` Fengguang Wu
2016-07-11 1:46 Stephen Rothwell
2016-07-11 4:48 ` Mika Westerberg
2016-07-11 5:29 ` Stephen Rothwell
2016-07-11 12:57 ` Rafael J. Wysocki
2016-06-02 2:12 Stephen Rothwell
2016-04-01 1:27 Stephen Rothwell
2016-04-01 20:51 ` Rafael J. Wysocki
2015-12-09 1:54 Stephen Rothwell
2015-12-09 2:00 ` Viresh Kumar
2015-11-01 6:57 Stephen Rothwell
2015-11-02 0:37 ` Rafael J. Wysocki
2015-04-13 4:24 Stephen Rothwell
2015-04-13 12:06 ` Rafael J. Wysocki
2015-04-15 2:30 ` Stephen Rothwell
2015-02-09 2:26 Stephen Rothwell
2015-02-09 2:53 ` Jiang Liu
2015-02-09 3:22 ` Rafael J. Wysocki
2015-02-09 5:36 ` Jiang Liu
2015-02-09 6:23 ` Lorenzo Pieralisi
2015-02-09 15:10 ` Rafael J. Wysocki
2015-02-09 15:21 ` Jiang Liu
2015-02-09 15:50 ` Lorenzo Pieralisi
2015-02-09 3:19 ` Rafael J. Wysocki
2015-02-09 3:53 ` Lorenzo Pieralisi
2014-08-11 1:57 Stephen Rothwell
2014-08-12 1:10 ` Rafael J. Wysocki
2013-12-18 1:00 Stephen Rothwell
2013-12-18 1:17 ` Rafael J. Wysocki
2013-07-05 1:24 Stephen Rothwell
2013-07-05 1:37 ` Rafael J. Wysocki
2013-03-03 23:58 Stephen Rothwell
2013-03-04 11:54 ` Rafael J. Wysocki
2013-01-30 8:48 Stephen Rothwell
2013-01-30 12:50 ` Rafael J. Wysocki
2013-01-14 0:03 Stephen Rothwell
2013-01-14 12:37 ` Rafael J. Wysocki
2013-01-14 13:22 ` Sedat Dilek
2013-01-14 18:54 ` Rafael J. Wysocki
2012-11-28 4:02 Stephen Rothwell
2012-11-28 9:32 ` Rafael J. Wysocki
2012-11-26 6:09 Stephen Rothwell
2012-11-26 10:10 ` Rafael J. Wysocki
2012-09-25 4:30 Stephen Rothwell
2012-09-25 11:51 ` Rafael J. Wysocki
2012-06-20 5:01 Stephen Rothwell
2012-06-20 22:54 ` Rafael J. Wysocki
2012-01-27 1:53 Stephen Rothwell
2012-01-27 9:35 ` Rafael J. Wysocki
2011-11-10 2:31 Stephen Rothwell
2011-11-10 12:11 ` Rafael J. Wysocki
2011-11-10 15:48 ` Tejun Heo
2011-11-11 12:27 ` Rafael J. Wysocki
2011-09-28 4:51 Stephen Rothwell
2011-09-28 5:11 ` Ming Lei
2011-09-28 13:58 ` Rafael J. Wysocki
2011-09-28 14:47 ` Ming Lei
2011-09-28 19:32 ` Rafael J. Wysocki
2011-09-29 1:32 ` Ming Lei
2011-09-29 9:26 ` Rafael J. Wysocki
2011-09-29 9:32 ` Ming Lei
2011-09-29 20:25 ` Rafael J. Wysocki
2011-09-28 14:47 ` Rafael J. Wysocki
2011-08-19 13:47 Stephen Rothwell
2011-08-19 21:31 ` Rafael J. Wysocki
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=20190701074847.onx6irxbhkc5hbp3@vireshk-i7 \
--to=viresh.kumar@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=sfr@canb.auug.org.au \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).