Skip to content

Commit c25badc

Browse files
labbottrafaeljw
authored andcommitted
cpupower: Correct return type of cpu_power_is_cpu_online() in cpufreq-set
When converting to a shared library in ac5a181 ("cpupower: Add cpuidle parts into library"), cpu_freq_cpu_exists() was converted to cpupower_is_cpu_online(). cpu_req_cpu_exists() returned 0 on success and -ENOSYS on failure whereas cpupower_is_cpu_online returns 1 on success. Check for the correct return value in cpufreq-set. Link: https://bugzilla.redhat.com/show_bug.cgi?id=1374212 Fixes: ac5a181 (cpupower: Add cpuidle parts into library) Reported-by: Julian Seward <jseward@acm.org> Signed-off-by: Laura Abbott <labbott@redhat.com> Acked-by: Thomas Renninger <trenn@suse.com> Cc: 4.7+ <stable@vger.kernel.org> # 4.7+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent a909d3e commit c25badc

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

tools/power/cpupower/utils/cpufreq-set.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ int cmd_freq_set(int argc, char **argv)
296296
struct cpufreq_affected_cpus *cpus;
297297

298298
if (!bitmask_isbitset(cpus_chosen, cpu) ||
299-
cpupower_is_cpu_online(cpu))
299+
cpupower_is_cpu_online(cpu) != 1)
300300
continue;
301301

302302
cpus = cpufreq_get_related_cpus(cpu);
@@ -316,10 +316,7 @@ int cmd_freq_set(int argc, char **argv)
316316
cpu <= bitmask_last(cpus_chosen); cpu++) {
317317

318318
if (!bitmask_isbitset(cpus_chosen, cpu) ||
319-
cpupower_is_cpu_online(cpu))
320-
continue;
321-
322-
if (cpupower_is_cpu_online(cpu) != 1)
319+
cpupower_is_cpu_online(cpu) != 1)
323320
continue;
324321

325322
printf(_("Setting cpu: %d\n"), cpu);

0 commit comments

Comments
 (0)