Skip to contentSkip to conversation

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

PATCH Applied Sinan Kaya 2 participants 2 messages Dec 30, 2018 – Jan 3, 2019

Subsystems (2)
Linux-next tree ACPI
lore
Share & tools
lore

Sinan Kaya

author
#0 lore raw

PATCH 1/1 ACPI: Fix build failure when CONFIG_NLS is set to 'n'

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 <[email protected]>
---
 drivers/acpi/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/acpi/Kconfig +1 -0
index 7b65a807b3dd..90ff0a47c12e 100644
@@ -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
Signature · 1 line
2.19.0
maintainer Applied
#1 lore raw
Quoted 25 lines · Sinan Kaya

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 <[email protected]>
---
 drivers/acpi/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/acpi/Kconfig +0 -0
index 7b65a807b3dd..90ff0a47c12e 100644

drivers/acpi/Kconfig menuconfig ACPI

Quoted 8 lines
drivers/acpi/Kconfig +1 -1
@@ -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!