| Message ID | 20210717031806.29866-1-wangrui@loongson.cn |
|---|---|
| State | New |
| Headers | show |
| Series | ACPI: Kconfig: Fix table override from built-in initrd | expand |
On Sat, Jul 17, 2021 at 5:18 AM Rui Wang <wangrui@loongson.cn> wrote: > > The commit 65e00e04e5aea ("initramfs: refactor the initramfs build rules") > had dropped the CONFIG_INITRAMFS_COMPRESSION. > > This patch updates INITRAMFS_COMPRESSION="" to INITRAMFS_COMPRESSION_NONE. > > CC: Rafael J. Wysocki <rjw@rjwysocki.net> > CC: Len Brown <lenb@kernel.org> > CC: Shunyong Yang <shunyong.yang@hxt-semitech.com> > CC: linux-acpi@vger.kernel.org > CC: linux-kernel@vger.kernel.org > Signed-off-by: Rui Wang <wangrui@loongson.cn> I've already applied an alternative patch making the same change: https://patchwork.kernel.org/project/linux-acpi/patch/ad9c50c54887bde41ae5de782248231c06a527c0.1626262835.git.rrichter@amd.com/ > --- > 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.32.0 >
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.
The commit 65e00e04e5aea ("initramfs: refactor the initramfs build rules") had dropped the CONFIG_INITRAMFS_COMPRESSION. This patch updates INITRAMFS_COMPRESSION="" to INITRAMFS_COMPRESSION_NONE. CC: Rafael J. Wysocki <rjw@rjwysocki.net> CC: Len Brown <lenb@kernel.org> CC: Shunyong Yang <shunyong.yang@hxt-semitech.com> CC: linux-acpi@vger.kernel.org CC: linux-kernel@vger.kernel.org Signed-off-by: Rui Wang <wangrui@loongson.cn> --- drivers/acpi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)