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] x86/PCI: ensure to_pci_sysdata usage is guarded by CONFIG_PCI
Date: Mon, 3 Feb 2020 19:19:06 +0100 [thread overview]
Message-ID: <20200203181906.78264-1-Jason@zx2c4.com> (raw)
Recently, the helper to_pci_sysdata was added inside of the CONFIG_PCI
guard, but it is used from inside of a CONFIG_PCI_MSI_IRQ_DOMAIN guard,
which does not require CONFIG_PCI. This breaks builds on !CONFIG_PCI
machines. This commit fixes the ifdef to require CONFIG_PCI.
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 40ac1330adb2..d8772b75236d 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -119,7 +119,7 @@ void native_restore_msi_irqs(struct pci_dev *dev);
/* generic pci stuff */
#include <asm-generic/pci.h>
-#ifdef CONFIG_NUMA
+#if defined(CONFIG_NUMA) && defined(CONFIG_PCI)
/* Returns the node based on pci bus */
static inline int __pcibus_to_node(const struct pci_bus *bus)
{
--
2.25.0
next reply other threads:[~2020-02-03 18:19 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-03 18:19 Jason A. Donenfeld [this message]
2020-02-03 20:09 ` [PATCH] x86/PCI: ensure to_pci_sysdata usage is guarded by CONFIG_PCI Bjorn Helgaas
2020-02-03 21:49 ` Jason A. Donenfeld
2020-02-03 21:53 ` [PATCH v2] x86/PCI: ensure to_pci_sysdata usage is available to !CONFIG_PCI Jason A. Donenfeld
2020-02-03 23:17 ` 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=20200203181906.78264-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