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 'acpi-6.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fixes from Rafael Wysocki:
"These add a missing PCC check for guaranteed_perf in the ACPI CPPC
library and fix a static local variable access race condition in
acpi_pcc_address_space_setup() (Pengjie Zhang)"

* tag 'acpi-6.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: PCC: Fix race condition by removing static qualifier
ACPI: CPPC: Fix missing PCC check for guaranteed_perf

Linus Torvalds 5caa3808 eb23a119

+3 -2
+1 -1
drivers/acpi/acpi_pcc.c
··· 52 52 struct pcc_data *data; 53 53 struct acpi_pcc_info *ctx = handler_context; 54 54 struct pcc_mbox_chan *pcc_chan; 55 - static acpi_status ret; 55 + acpi_status ret; 56 56 57 57 data = kzalloc(sizeof(*data), GFP_KERNEL); 58 58 if (!data)
+2 -1
drivers/acpi/cppc_acpi.c
··· 1366 1366 /* Are any of the regs PCC ?*/ 1367 1367 if (CPC_IN_PCC(highest_reg) || CPC_IN_PCC(lowest_reg) || 1368 1368 CPC_IN_PCC(lowest_non_linear_reg) || CPC_IN_PCC(nominal_reg) || 1369 - CPC_IN_PCC(low_freq_reg) || CPC_IN_PCC(nom_freq_reg)) { 1369 + CPC_IN_PCC(low_freq_reg) || CPC_IN_PCC(nom_freq_reg) || 1370 + CPC_IN_PCC(guaranteed_reg)) { 1370 1371 if (pcc_ss_id < 0) { 1371 1372 pr_debug("Invalid pcc_ss_id\n"); 1372 1373 return -ENODEV;