Skip to content

Commit 6cbab78

Browse files
committed
Merge back cpufreq material for v5.14.
2 parents 771fac5 + bcc936c commit 6cbab78

File tree

6 files changed

+243
-34
lines changed

6 files changed

+243
-34
lines changed

Documentation/admin-guide/pm/intel_pstate.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,9 @@ argument is passed to the kernel in the command line.
365365
inclusive) including both turbo and non-turbo P-states (see
366366
`Turbo P-states Support`_).
367367

368+
This attribute is present only if the value exposed by it is the same
369+
for all of the CPUs in the system.
370+
368371
The value of this attribute is not affected by the ``no_turbo``
369372
setting described `below <no_turbo_attr_>`_.
370373

@@ -374,6 +377,9 @@ argument is passed to the kernel in the command line.
374377
Ratio of the `turbo range <turbo_>`_ size to the size of the entire
375378
range of supported P-states, in percent.
376379

380+
This attribute is present only if the value exposed by it is the same
381+
for all of the CPUs in the system.
382+
377383
This attribute is read-only.
378384

379385
.. _no_turbo_attr:

drivers/cpufreq/cpufreq_stats.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ void cpufreq_stats_free_table(struct cpufreq_policy *policy)
211211

212212
void cpufreq_stats_create_table(struct cpufreq_policy *policy)
213213
{
214-
unsigned int i = 0, count = 0, ret = -ENOMEM;
214+
unsigned int i = 0, count;
215215
struct cpufreq_stats *stats;
216216
unsigned int alloc_size;
217217
struct cpufreq_frequency_table *pos;
@@ -253,8 +253,7 @@ void cpufreq_stats_create_table(struct cpufreq_policy *policy)
253253
stats->last_index = freq_table_get_index(stats, policy->cur);
254254

255255
policy->stats = stats;
256-
ret = sysfs_create_group(&policy->kobj, &stats_attr_group);
257-
if (!ret)
256+
if (!sysfs_create_group(&policy->kobj, &stats_attr_group))
258257
return;
259258

260259
/* We failed, release resources */

0 commit comments

Comments
 (0)