Skip to content

Commit b184c04

Browse files
committed
Merge tag 'acpi-6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki: "These fix a general ACPI processor driver regression and an ia64 build issue, both introduced recently. Specifics: - Fix recently introduced uninitialized memory access issue in the ACPI processor driver (Michal Wilczynski) - Fix ia64 build inadvertently broken by recent ACPI processor driver changes, which is prudent to do for 6.6 even though ia64 support is slated for removal in 6.7 (Ard Biesheuvel)" * tag 'acpi-6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI: processor: Fix uninitialized access of buf in acpi_set_pdc_bits() acpi: Provide ia64 dummy implementation of acpi_proc_quirk_mwait_check()
2 parents 36fcf38 + a1001c3 commit b184c04

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

arch/ia64/kernel/acpi.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -907,3 +907,7 @@ EXPORT_SYMBOL(acpi_unregister_ioapic);
907907
* TBD when IA64 starts to support suspend...
908908
*/
909909
int acpi_suspend_lowlevel(void) { return 0; }
910+
911+
void acpi_proc_quirk_mwait_check(void)
912+
{
913+
}

drivers/acpi/processor_pdc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ static void acpi_set_pdc_bits(u32 *buf)
1919
{
2020
buf[0] = ACPI_PDC_REVISION_ID;
2121
buf[1] = 1;
22+
buf[2] = 0;
2223

2324
/* Twiddle arch-specific bits needed for _PDC */
2425
arch_acpi_set_proc_cap_bits(&buf[2]);

0 commit comments

Comments
 (0)