[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20070621183615.GI5193@alberich.amd.com>
Date: Thu, 21 Jun 2007 20:36:15 +0200
From: "Andreas Herrmann" <andreas.herrmann3@....com>
To: "Ravikiran G Thirumalai" <kiran@...lex86.org>
cc: "Len Brown" <lenb@...nel.org>,
"Steven Whitehouse" <swhiteho@...hat.com>,
"Andi Kleen" <ak@...e.de>, "Shai Fultheim" <shai@...lex86.org>,
linux-kernel@...r.kernel.org, linux-acpi@...r.kernel.org
Subject: Re: [PATCH 7/12] acpi: fix another compile warning
On Wed, Jun 20, 2007 at 11:25:48AM -0700, Ravikiran G Thirumalai wrote:
> On Wed, Jun 20, 2007 at 09:36:30AM -0400, Len Brown wrote:
> > On Wednesday 20 June 2007 04:49, Andreas Herrmann wrote:
> > > On Tue, Jun 19, 2007 at 11:38:02PM -0400, Len Brown wrote:
> > > > On Tuesday 19 June 2007 18:50, Andreas Herrmann wrote:
> >
> > I fear, however, that this patch defeats the purpose of
> > b0bd35e622ffbda2c01dc67a0381c6a18817a29a -- which was to make selecting
> > NUMA more user-friendly. So it might make more sense to simply revert that
> > patch entirely.
> >
> > The underlying problem is that Kconfig doesn't support using select
> > on targets which themselves have dependencies.
> >
> > Signed-off-by: Len Brown <len.brown@...el.com>
> >
> >
> > diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
> > index 5ce9443..e9d7767 100644
> > --- a/arch/x86_64/Kconfig
> > +++ b/arch/x86_64/Kconfig
> > @@ -364,9 +364,9 @@ config NODES_SHIFT
> > config X86_64_ACPI_NUMA
> > bool "ACPI NUMA detection"
> > depends on NUMA
> > - select ACPI
> > + depends on ACPI
> > select PCI
> > - select ACPI_NUMA
> > + depends on ACPI_NUMA
> > default y
> > help
> > Enable ACPI SRAT based node topology detection.
> > -
>
> arch/x86_64/Kconfig:706:error: found recursive dependency: PCI -> ACPI ->
> X86_64_ACPI_NUMA -> PCI
> -> USB_ARCH_HAS_OHCI -> USB_ARCH_HAS_HCD -> MOUSE_APPLETOUCH -> USB ->
> USB_SISUSBVGAmake[1]: *** [menuconfig] Error 1
>
> I guess we have to change PCI to 'depends on' as well.
> Else, select PM?
>
> I am OK with either approach.
>
> Thanks,
> Kiran
>
> Paper over 'select' inadequacies.
>
> Signed-off-by: Ravikiran Thirumalai <kiran@...lex86.org>
>
> Index: linux-2.6.22-rc5/arch/x86_64/Kconfig
> ===================================================================
> --- linux-2.6.22-rc5.orig/arch/x86_64/Kconfig 2007-06-18 16:02:19.571323415 -0700
> +++ linux-2.6.22-rc5/arch/x86_64/Kconfig 2007-06-20 11:34:29.845354250 -0700
> @@ -366,6 +366,7 @@ config X86_64_ACPI_NUMA
> depends on NUMA
> select ACPI
> select PCI
> + select PM
> select ACPI_NUMA
> default y
> help
Yep, this one-liner solves all acpi related compile errors/warnings
that I've reported.
Additional it resolves anoter problem that results from
dependencies between CONFIG_PNP and CONFIG_ACPI.
One problem arises:
If PM is deselected, the PNP menu is empty on x86_64.
So I suggest to add the attached patch to hide the PNP-menu
if no PM (and thus ACPI) is selected.
Regards,
Andreas
--
Make CONFIG_PNP a menuconfig to hide the submenu if neither
ISA nor ACPI is selected.
Signed-off-by: Andreas Herrmann <andreas.herrmann3@....com>
diff --git a/drivers/pnp/Kconfig b/drivers/pnp/Kconfig
index 1959cef..2291e7d 100644
--- a/drivers/pnp/Kconfig
+++ b/drivers/pnp/Kconfig
@@ -2,11 +2,9 @@
# Plug and Play configuration
#
-menu "Plug and Play support"
- depends on HAS_IOMEM
-
-config PNP
+menuconfig PNP
bool "Plug and Play support"
+ depends on HAS_IOMEM
depends on ISA || ACPI
---help---
Plug and Play (PnP) is a standard for peripherals which allows those
@@ -22,15 +20,15 @@ config PNP
If unsure, say Y.
+if PNP
+
config PNP_DEBUG
bool "PnP Debug Messages"
- depends on PNP
help
Say Y if you want the Plug and Play Layer to print debug messages.
This is useful if you are developing a PnP driver or troubleshooting.
comment "Protocols"
- depends on PNP
source "drivers/pnp/isapnp/Kconfig"
@@ -38,5 +36,4 @@ source "drivers/pnp/pnpbios/Kconfig"
source "drivers/pnp/pnpacpi/Kconfig"
-endmenu
-
+endif
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists