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

Pull ACPI fix from Rafael Wysocki:
"Restore the initrd-based ACPI table override functionality broken by
one of the recent fixes"

* tag 'acpi-5.12-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: x86: Call acpi_boot_table_init() after acpi_table_upgrade()

Linus Torvalds 7e25f40e 33f0d9d9

+2 -3
+2 -3
arch/x86/kernel/setup.c
··· 1045 1045 1046 1046 cleanup_highmap(); 1047 1047 1048 - /* Look for ACPI tables and reserve memory occupied by them. */ 1049 - acpi_boot_table_init(); 1050 - 1051 1048 memblock_set_current_limit(ISA_END_ADDRESS); 1052 1049 e820__memblock_setup(); 1053 1050 ··· 1129 1132 reserve_initrd(); 1130 1133 1131 1134 acpi_table_upgrade(); 1135 + /* Look for ACPI tables and reserve memory occupied by them. */ 1136 + acpi_boot_table_init(); 1132 1137 1133 1138 vsmp_init(); 1134 1139