On Sun, Sep 19, 2021 at 2:28 PM Nathan Chancellor <nathan@xxxxxxxxxx> wrote:
>
> Commit 9caea0007601 ("parisc: Declare pci_iounmap() parisc version only
> when CONFIG_PCI enabled") causes the following build error on arm64 with
> Fedora's config, which CKI initially reported:
Ok, so I spent a lot of time trying to figure out what the heck is going on.
And while this is really *REALLY* confusing code, and nobody should
use it, I think the fix is this oneliner:
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index e93375c710b9..692e964e56b4 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -1047,7 +1047,7 @@ extern void ioport_unmap(void __iomem *p);
#endif /* CONFIG_GENERIC_IOMAP */
#endif /* CONFIG_HAS_IOPORT_MAP */
-#ifndef CONFIG_GENERIC_IOMAP
+#ifndef CONFIG_GENERIC_PCI_IOMAP
struct pci_dev;
extern void __iomem *pci_iomap(struct pci_dev *dev, int bar,
unsigned long max);
let me go test, I do have an arm64 build environment for this all, but
for that commit I had only done parisc, alpha and x86-64.
Linus
