Messages in this thread Patch in this message |  | | From | "Jason A. Donenfeld" <> | Subject | [PATCH v2] x86/PCI: ensure to_pci_sysdata usage is available to !CONFIG_PCI | Date | Mon, 3 Feb 2020 22:53:06 +0100 |
| |
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
|  |