xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ACPI: Kconfig: Fix table override from built-in initrd

Browse Source 
[ Upstream commit d2cbbf1fe503c07e466c62f83aa1926d74d15821 ]

During a rework of initramfs code the INITRAMFS_COMPRESSION config
option was removed in commit 65e00e04e5. A leftover as a dependency
broke the config option ACPI_TABLE_OVERRIDE_VIA_ BUILTIN_INITRD that
is used to enable the overriding of ACPI tables from built-in initrd.
Fixing the dependency.

Fixes: 65e00e04e5 ("initramfs: refactor the initramfs build rules")
Signed-off-by: Robert Richter <rrichter@amd.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Robert Richter
2021-07-15 11:26:01 +02:00
committed by Greg Kroah-Hartman
parent 113ce8c504
commit 2646368944
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/Kconfig
View File

@@ -359,7 +359,7 @@ config ACPI_TABLE_UPGRADE
config ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD config ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD
bool "Override ACPI tables from built-in initrd" bool "Override ACPI tables from built-in initrd"
depends on ACPI_TABLE_UPGRADE depends on ACPI_TABLE_UPGRADE
depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION="" depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION_NONE
help help
This option provides functionality to override arbitrary ACPI tables This option provides functionality to override arbitrary ACPI tables
from built-in uncompressed initrd. from built-in uncompressed initrd.