Patchwork ACPI: Fix build failure when CONFIG_NLS is set to 'n'

login
register
mail settings
Submitter Sinan Kaya
Date Dec. 30, 2018, 8:40 p.m.
Message ID <20181230204005.6397-1-okaya@kernel.org>
Download mbox | patch
Permalink /patch/691031/
State New
Headers show

Comments

Sinan Kaya - Dec. 30, 2018, 8:40 p.m.
Observing link failure as follows when CONFIG_ACPI is set but
both CONFIG_NLS and CONFIG_PCI are unset.

drivers/acpi/device_sysfs.o: In function `description_show':
device_sysfs.c:(.text+0x48a): undefined reference to `utf16s_to_utf8s'

This issue has been previously fxed by
'commit 8a226e00eeed ("PCI: pci-label: Fix build failure when CONFIG_NLS
is set to 'm' by allmodconfig")' selecting NLS when ACPI is present.

Now that it is possible to have ACPI without PCI, we need an alternative
select statement inside the ACPI kconfig.

Fixes: 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
 drivers/acpi/Kconfig | 1 +
 1 file changed, 1 insertion(+)
Rafael J. Wysocki - Jan. 3, 2019, 10:07 a.m.
On Sun, Dec 30, 2018 at 9:40 PM Sinan Kaya <okaya@kernel.org> wrote:
>
> Observing link failure as follows when CONFIG_ACPI is set but
> both CONFIG_NLS and CONFIG_PCI are unset.
>
> drivers/acpi/device_sysfs.o: In function `description_show':
> device_sysfs.c:(.text+0x48a): undefined reference to `utf16s_to_utf8s'
>
> This issue has been previously fxed by
> 'commit 8a226e00eeed ("PCI: pci-label: Fix build failure when CONFIG_NLS
> is set to 'm' by allmodconfig")' selecting NLS when ACPI is present.
>
> Now that it is possible to have ACPI without PCI, we need an alternative
> select statement inside the ACPI kconfig.
>
> Fixes: 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
> Signed-off-by: Sinan Kaya <okaya@kernel.org>
> ---
>  drivers/acpi/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
> index 7b65a807b3dd..90ff0a47c12e 100644
> --- a/drivers/acpi/Kconfig
> +++ b/drivers/acpi/Kconfig
> @@ -10,6 +10,7 @@ menuconfig ACPI
>         bool "ACPI (Advanced Configuration and Power Interface) Support"
>         depends on ARCH_SUPPORTS_ACPI
>         select PNP
> +       select NLS
>         default y if X86
>         help
>           Advanced Configuration and Power Interface (ACPI) support for
> --

Applied, with some changelog modifications.

Thanks!

Patch

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 7b65a807b3dd..90ff0a47c12e 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -10,6 +10,7 @@  menuconfig ACPI
 	bool "ACPI (Advanced Configuration and Power Interface) Support"
 	depends on ARCH_SUPPORTS_ACPI
 	select PNP
+	select NLS
 	default y if X86
 	help
 	  Advanced Configuration and Power Interface (ACPI) support for