tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 0cf710f8 9c41180b

+13 -4
+2
drivers/cpufreq/Kconfig
··· 275 275 276 276 config LOONGSON2_CPUFREQ 277 277 tristate "Loongson2 CPUFreq Driver" 278 + depends on LEMOTE_MACH2F 278 279 help 279 280 This option adds a CPUFreq driver for loongson processors which 280 281 support software configurable cpu frequency. ··· 288 287 289 288 config LOONGSON1_CPUFREQ 290 289 tristate "Loongson1 CPUFreq Driver" 290 + depends on LOONGSON1_LS1B 291 291 help 292 292 This option adds a CPUFreq driver for loongson1 processors which 293 293 support software configurable cpu frequency.
+4
drivers/cpufreq/mediatek-cpufreq.c
··· 620 620 return 0; 621 621 } 622 622 device_initcall(mtk_cpufreq_driver_init); 623 + 624 + MODULE_DESCRIPTION("MediaTek CPUFreq driver"); 625 + MODULE_AUTHOR("Pi-Cheng Chen <pi-cheng.chen@linaro.org>"); 626 + MODULE_LICENSE("GPL v2");
+1 -1
tools/power/cpupower/bench/system.c
··· 61 61 62 62 dprintf("set %s as cpufreq governor\n", governor); 63 63 64 - if (cpupower_is_cpu_online(cpu) != 0) { 64 + if (cpupower_is_cpu_online(cpu) != 1) { 65 65 perror("cpufreq_cpu_exists"); 66 66 fprintf(stderr, "error: cpu %u does not exist\n", cpu); 67 67 return -1;
+6 -3
tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
··· 130 130 { 131 131 int num; 132 132 char *tmp; 133 + int this_cpu; 134 + 135 + this_cpu = sched_getcpu(); 133 136 134 137 /* Assume idle state count is the same for all CPUs */ 135 - cpuidle_sysfs_monitor.hw_states_num = cpuidle_state_count(0); 138 + cpuidle_sysfs_monitor.hw_states_num = cpuidle_state_count(this_cpu); 136 139 137 140 if (cpuidle_sysfs_monitor.hw_states_num <= 0) 138 141 return NULL; 139 142 140 143 for (num = 0; num < cpuidle_sysfs_monitor.hw_states_num; num++) { 141 - tmp = cpuidle_state_name(0, num); 144 + tmp = cpuidle_state_name(this_cpu, num); 142 145 if (tmp == NULL) 143 146 continue; 144 147 ··· 149 146 strncpy(cpuidle_cstates[num].name, tmp, CSTATE_NAME_LEN - 1); 150 147 free(tmp); 151 148 152 - tmp = cpuidle_state_desc(0, num); 149 + tmp = cpuidle_state_desc(this_cpu, num); 153 150 if (tmp == NULL) 154 151 continue; 155 152 strncpy(cpuidle_cstates[num].desc, tmp, CSTATE_DESC_LEN - 1);