| Message ID | 20180821203750.2394352-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Rafael Wysocki |
| Headers | show |
| Series | ACPI: fix menuconfig presentation of ACPI submenu | expand |
On Tue, Aug 21, 2018 at 10:38 PM Arnd Bergmann <arnd@arndb.de> wrote: > > My fix for a recursive Kconfig dependency caused another issue where the > ACPI specific options end up in the top-level menu in 'menuconfig'. This > was an unintended side-effect of having a silent option between > 'menuconfig ACPI' and 'if ACPI'. > > Moving the ARCH_SUPPORTS_ACPI symbol ahead of the ACPI menu solves that > problem and restores the previous presentation. > > Reported-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > Fixes: 2c870e61132c ("arm64: fix ACPI dependencies") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Applied, thanks! I'll push this to Linus tomorrow. > --- > drivers/acpi/Kconfig | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig > index 1edca05ee0ae..e92eab1e960c 100644 > --- a/drivers/acpi/Kconfig > +++ b/drivers/acpi/Kconfig > @@ -3,6 +3,9 @@ > # ACPI Configuration > # > > +config ARCH_SUPPORTS_ACPI > + bool > + > menuconfig ACPI > bool "ACPI (Advanced Configuration and Power Interface) Support" > depends on ARCH_SUPPORTS_ACPI > @@ -40,9 +43,6 @@ menuconfig ACPI > <http://www.acpi.info> > <http://www.uefi.org/acpi/specs> > > -config ARCH_SUPPORTS_ACPI > - bool > - > if ACPI > > config ACPI_LEGACY_TABLES_LOOKUP > -- > 2.18.0 >
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 1edca05ee0ae..e92eab1e960c 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -3,6 +3,9 @@ # ACPI Configuration # +config ARCH_SUPPORTS_ACPI + bool + menuconfig ACPI bool "ACPI (Advanced Configuration and Power Interface) Support" depends on ARCH_SUPPORTS_ACPI @@ -40,9 +43,6 @@ menuconfig ACPI <http://www.acpi.info> <http://www.uefi.org/acpi/specs> -config ARCH_SUPPORTS_ACPI - bool - if ACPI config ACPI_LEGACY_TABLES_LOOKUP
My fix for a recursive Kconfig dependency caused another issue where the ACPI specific options end up in the top-level menu in 'menuconfig'. This was an unintended side-effect of having a silent option between 'menuconfig ACPI' and 'if ACPI'. Moving the ARCH_SUPPORTS_ACPI symbol ahead of the ACPI menu solves that problem and restores the previous presentation. Reported-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Fixes: 2c870e61132c ("arm64: fix ACPI dependencies") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/acpi/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)