Merge tag 'pm-4.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki: - add missing module information to the Mediatek cpufreq driver module (Jesse Chan) - fix config dependencies for the Loongson cpufreq driver (James Hogan) - fix two issues related to CPU offline in the cpupower utility (Abhishek Goel). * tag 'pm-4.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: cpufreq: mediatek: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE cpufreq: Add Loongson machine dependencies cpupower : Fix cpupower working when cpu0 is offline cpupowerutils: bench - Fix cpu online check
This commit is contained in:
@@ -61,7 +61,7 @@ int set_cpufreq_governor(char *governor, unsigned int cpu)
|
||||
|
||||
dprintf("set %s as cpufreq governor\n", governor);
|
||||
|
||||
if (cpupower_is_cpu_online(cpu) != 0) {
|
||||
if (cpupower_is_cpu_online(cpu) != 1) {
|
||||
perror("cpufreq_cpu_exists");
|
||||
fprintf(stderr, "error: cpu %u does not exist\n", cpu);
|
||||
return -1;
|
||||
|
@@ -130,15 +130,18 @@ static struct cpuidle_monitor *cpuidle_register(void)
|
||||
{
|
||||
int num;
|
||||
char *tmp;
|
||||
int this_cpu;
|
||||
|
||||
this_cpu = sched_getcpu();
|
||||
|
||||
/* Assume idle state count is the same for all CPUs */
|
||||
cpuidle_sysfs_monitor.hw_states_num = cpuidle_state_count(0);
|
||||
cpuidle_sysfs_monitor.hw_states_num = cpuidle_state_count(this_cpu);
|
||||
|
||||
if (cpuidle_sysfs_monitor.hw_states_num <= 0)
|
||||
return NULL;
|
||||
|
||||
for (num = 0; num < cpuidle_sysfs_monitor.hw_states_num; num++) {
|
||||
tmp = cpuidle_state_name(0, num);
|
||||
tmp = cpuidle_state_name(this_cpu, num);
|
||||
if (tmp == NULL)
|
||||
continue;
|
||||
|
||||
@@ -146,7 +149,7 @@ static struct cpuidle_monitor *cpuidle_register(void)
|
||||
strncpy(cpuidle_cstates[num].name, tmp, CSTATE_NAME_LEN - 1);
|
||||
free(tmp);
|
||||
|
||||
tmp = cpuidle_state_desc(0, num);
|
||||
tmp = cpuidle_state_desc(this_cpu, num);
|
||||
if (tmp == NULL)
|
||||
continue;
|
||||
strncpy(cpuidle_cstates[num].desc, tmp, CSTATE_DESC_LEN - 1);
|
||||
|
Reference in New Issue
Block a user