[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200203181906.78264-1-Jason@zx2c4.com>
Date: Mon, 3 Feb 2020 19:19:06 +0100
From: "Jason A. Donenfeld" <Jason@...c4.com>
To: linux-kernel@...r.kernel.org, bhelgaas@...gle.com, x86@...nel.org,
hch@....de
Cc: "Jason A. Donenfeld" <Jason@...c4.com>
Subject: [PATCH] x86/PCI: ensure to_pci_sysdata usage is guarded by CONFIG_PCI
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@...c4.com>
Fixes: aad6aa0cd674 ("x86/PCI: Add to_pci_sysdata() helper")
Cc: Christoph Hellwig <hch@....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
Powered by blists - more mailing lists