public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Bjorn Helgaas <bhelgaas@google•com>
To: "Rafael J. Wysocki" <rafael.j.wysocki@intel•com>
Cc: Randy Dunlap <rdunlap@infradead•org>,
	Stephen Rothwell <sfr@canb•auug.org.au>,
	linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: Tree for Apr 28 (drivers/pnp/quirks.c)
Date: Mon, 28 Apr 2014 16:09:28 -0600	[thread overview]
Message-ID: <20140428220928.GA19838@google.com> (raw)
In-Reply-To: <535EC4A7.5070001@intel.com>

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@google•com>
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@infradead•org>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google•com>

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
 	{""}

  reply	other threads:[~2014-04-28 22:09 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-28  6:57 linux-next: Tree for Apr 28 Stephen Rothwell
2014-04-28 17:45 ` linux-next: Tree for Apr 28 (drivers/pnp/quirks.c) Randy Dunlap
2014-04-28 21:11   ` Bjorn Helgaas
2014-04-28 21:14     ` Rafael J. Wysocki
2014-04-28 22:09       ` Bjorn Helgaas [this message]
2014-04-28 22:38         ` Rafael J. Wysocki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140428220928.GA19838@google.com \
    --to=bhelgaas@google$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=rafael.j.wysocki@intel$(echo .)com \
    --cc=rdunlap@infradead$(echo .)org \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox