]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
arm64: fix ACPI dependencies
authorArnd Bergmann <arnd@arndb.de>
Tue, 28 Aug 2018 20:47:00 +0000 (22:47 +0200)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 5 Sep 2018 08:30:45 +0000 (10:30 +0200)
commit0d3b81710b4b60dd1d1460b407636e6b92ded235
treeb88d715e2a31dd3b816ffc22f1e514ac175f0095
parent6aea4802f3c7c48dc871d1176408eea5d64d0062
arm64: fix ACPI dependencies

BugLink: https://bugs.launchpad.net/bugs/1786878
Kconfig reports a warning on x86 builds after the ARM64 dependency
was added.

drivers/acpi/Kconfig:6:error: recursive dependency detected!
drivers/acpi/Kconfig:6:       symbol ACPI depends on EFI

This rephrases the dependency to keep the ARM64 details out of the
shared Kconfig file, so Kconfig no longer gets confused by it.

For consistency, all three architectures that support ACPI now
select ARCH_SUPPORTS_ACPI in exactly the configuration in which
they allow it. We still need the 'default x86', as each one
wants a different default: default-y on x86, default-n on arm64,
and always-y on ia64.

Fixes: 5bcd44083a08 ("drivers: acpi: add dependency of EFI for arm64")
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Will Deacon <will.deacon@arm.com>
(cherry picked from commit 2c870e61132c082a03769d2ac0a2849ba33c10e3)
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
arch/arm64/Kconfig
arch/ia64/Kconfig
arch/x86/Kconfig
drivers/acpi/Kconfig