From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: linux-kernel@vger.kernel.org, bhelgaas@google.com,
x86@kernel.org, hch@lst.de
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>
Subject: [PATCH v2] x86/PCI: ensure to_pci_sysdata usage is available to !CONFIG_PCI
Date: Mon, 3 Feb 2020 22:53:06 +0100 [thread overview]
Message-ID: <20200203215306.172000-1-Jason@zx2c4.com> (raw)
In-Reply-To: <20200203200942.GA130652@google.com>
Recently, the helper to_pci_sysdata was added inside of the CONFIG_PCI
guard, but it is used from inside of a CONFIG_NUMA guard, which does not
require CONFIG_PCI. This breaks builds on !CONFIG_PCI machines. This
commit makes that function available in all configurations.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Fixes: aad6aa0cd674 ("x86/PCI: Add to_pci_sysdata() helper")
Cc: Christoph Hellwig <hch@lst.de>
---
arch/x86/include/asm/pci.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 40ac1330adb2..7ccb338507e3 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -33,13 +33,13 @@ extern int pci_routeirq;
extern int noioapicquirk;
extern int noioapicreroute;
-#ifdef CONFIG_PCI
-
static inline struct pci_sysdata *to_pci_sysdata(const struct pci_bus *bus)
{
return bus->sysdata;
}
+#ifdef CONFIG_PCI
+
#ifdef CONFIG_PCI_DOMAINS
static inline int pci_domain_nr(struct pci_bus *bus)
{
--
2.25.0
next prev parent reply other threads:[~2020-02-03 21:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-03 18:19 [PATCH] x86/PCI: ensure to_pci_sysdata usage is guarded by CONFIG_PCI Jason A. Donenfeld
2020-02-03 20:09 ` Bjorn Helgaas
2020-02-03 21:49 ` Jason A. Donenfeld
2020-02-03 21:53 ` Jason A. Donenfeld [this message]
2020-02-03 23:17 ` [PATCH v2] x86/PCI: ensure to_pci_sysdata usage is available to !CONFIG_PCI Randy Dunlap
2020-02-04 6:06 ` Christoph Hellwig
2020-02-04 14:51 ` Bjorn Helgaas
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=20200203215306.172000-1-Jason@zx2c4.com \
--to=jason@zx2c4.com \
--cc=bhelgaas@google.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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