Re: linux-next: Tree for Apr 28 (drivers/pnp/quirks.c)

[Bjorn Helgaas]

On Mon, Apr 28, 2014 at 11:14:15PM +0200, Rafael J. Wysocki wrote:
> On 4/28/2014 11:11 PM, Bjorn Helgaas wrote:
> >On Mon, Apr 28, 2014 at 10:45:37AM -0700, Randy Dunlap wrote:
> >>On 04/27/14 23:57, Stephen Rothwell wrote:
> >>>Hi all,
> >>>
> >>>This tree still fails (more than usual) the powerpc allyesconfig build.
> >>>
> >>>Changes since 20140424:
> >>>
> >>on i386:
> >>
> >>   CC      drivers/pnp/quirks.o
> >>drivers/pnp/quirks.c: In function 'quirk_intel_mch':
> >>drivers/pnp/quirks.c:393:2: error: implicit declaration of function 'pcibios_bus_to_resource' [-Werror=implicit-function-declaration]
> >>cc1: some warnings being treated as errors
> >>make[3]: *** [drivers/pnp/quirks.o] Error 1
> >Thanks Randy.  This is a config that doesn't define CONFIG_PCI.  Rafael,
> >here's an incremental fix, or the full updated patch is below.
> 
> Well, that went to Linus already, so a fix on top of 3.15-rc3 is needed.

Of course; I should have noticed that.

> >+#if defined(CONFIG_X86) && defined(CONFIG_PCI)
> 
> Do we need both or would CONFIG_PCI be sufficient?

CONFIG_PCI alone should be sufficient.  Here's a fix on top of
v3.15-rc3.  Sorry for all the hassle.


commit c03ae9359c7f97854567f897bafcb2e6489d155f
Author: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
Date:   Thu Apr 17 14:22:18 2014 -0600

    PNP: Fix compile error
    
    Fix the compile error:
    
      drivers/pnp/quirks.c:393:2: error: implicit declaration of function 'pcibios_bus_to_resource'
    
    that occurs when building with CONFIG_PCI unset.  The quirk is only
    relevent to Intel devices, so we could use "#if defined(CONFIG_X86) &&
    defined(CONFIG_PCI)" instead, but testing CONFIG_X86 is not strictly
    necessary.
    
    Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
    Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>

diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 3736bc408adb..ebf0d6710b5a 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -335,7 +335,7 @@ static void quirk_amd_mmconfig_area(struct pnp_dev *dev)
 }
 #endif
 
-#ifdef CONFIG_X86
+#ifdef CONFIG_PCI
 /* Device IDs of parts that have 32KB MCH space */
 static const unsigned int mch_quirk_devices[] = {
 	0x0154,	/* Ivy Bridge */
@@ -440,7 +440,7 @@ static struct pnp_fixup pnp_fixups[] = {
 #ifdef CONFIG_AMD_NB
 	{"PNP0c01", quirk_amd_mmconfig_area},
 #endif
-#ifdef CONFIG_X86
+#ifdef CONFIG_PCI
 	{"PNP0c02", quirk_intel_mch},
 #endif
 	{""}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/