diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-12-19 08:37:08 +1200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-12-19 08:37:08 +1200 |
| commit | 5caa3808bc29de989f46451124e109dd33e464c6 (patch) | |
| tree | e66cc89dccc0bf0ddad807a8c76dce1caf026feb /drivers/acpi/acpi_pcc.c | |
| parent | eb23a1198d2317072a44ac1b8f5742f4cb48ce2c (diff) | |
| parent | f103fa127c93016bcd89b05d8e11dc1a84f6990d (diff) | |
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
Diffstat (limited to 'drivers/acpi/acpi_pcc.c')
| -rw-r--r-- | drivers/acpi/acpi_pcc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpi_pcc.c b/drivers/acpi/acpi_pcc.c index 97064e943768..e3f302b9dee5 100644 --- a/drivers/acpi/acpi_pcc.c +++ b/drivers/acpi/acpi_pcc.c @@ -52,7 +52,7 @@ acpi_pcc_address_space_setup(acpi_handle region_handle, u32 function, struct pcc_data *data; struct acpi_pcc_info *ctx = handler_context; struct pcc_mbox_chan *pcc_chan; - static acpi_status ret; + acpi_status ret; data = kzalloc(sizeof(*data), GFP_KERNEL); if (!data) |
