2021-07-15 13:41:48

by Robert Richter

Subject: [PATCH] ACPI: Kconfig: Fix table override from built-in initrd

During a rework of initramfs code the INITRAMFS_COMPRESSION config
option was removed in commit 65e00e04e5ae. 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: 65e00e04e5ae ("initramfs: refactor the initramfs build rules")
Signed-off-by: Robert Richter <[email protected]>
---
drivers/acpi/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 9d872ea477a6..8f9940f40baa 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -370,7 +370,7 @@ config ACPI_TABLE_UPGRADE
config ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD
bool "Override ACPI tables from built-in initrd"
depends on ACPI_TABLE_UPGRADE
- depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION=""
+ depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION_NONE
help
This option provides functionality to override arbitrary ACPI tables
from built-in uncompressed initrd.
--
2.29.2

2021-07-16 17:32:26

by Rafael J. Wysocki

Subject: Re: [PATCH] ACPI: Kconfig: Fix table override from built-in initrd

On Thu, Jul 15, 2021 at 11:26 AM Robert Richter <[email protected]> wrote:
>
> During a rework of initramfs code the INITRAMFS_COMPRESSION config
> option was removed in commit 65e00e04e5ae. 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: 65e00e04e5ae ("initramfs: refactor the initramfs build rules")
> Signed-off-by: Robert Richter <[email protected]>
> ---
> drivers/acpi/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
> index 9d872ea477a6..8f9940f40baa 100644
> --- a/drivers/acpi/Kconfig
> +++ b/drivers/acpi/Kconfig
> @@ -370,7 +370,7 @@ config ACPI_TABLE_UPGRADE
> config ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD
> bool "Override ACPI tables from built-in initrd"
> depends on ACPI_TABLE_UPGRADE
> - depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION=""
> + depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION_NONE
> help
> This option provides functionality to override arbitrary ACPI tables
> from built-in uncompressed initrd.
> --

Applied as 5.14-rc material, thanks!