The patch titled
asm-generic/iomap.h: add stubs for pci iomap/iounmap
has been added to the -mm tree. Its filename is
asm-generic-iomaph-add-stubs-for-pci-iomap-iounmap.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: asm-generic/iomap.h: add stubs for pci iomap/iounmap
From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
When CONFIG_PCI is not enabled, CONFIG_EISA=y, and CONFIG_GENERIC_IOMAP=y,
drivers/net/3c59x.c build fails due to a recent small change to
<asm-generic/iomap.h> that surrounds pci_iomap() and pci_iounmap() with
#ifdef CONFIG_PCI/#endif. Since that patch to iomap.h looks correct, add
stubs for pci_iomap() and pci_iounmap() with CONFIG_PCI is not enabled to
fix the build errors.
drivers/net/3c59x.c:1026: error: implicit declaration of function 'pci_iomap'
drivers/net/3c59x.c:1038: error: implicit declaration of function 'pci_iounmap'
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Cc: Jonas Bonn <jonas@xxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/asm-generic/iomap.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff -puN include/asm-generic/iomap.h~asm-generic-iomaph-add-stubs-for-pci-iomap-iounmap include/asm-generic/iomap.h
--- a/include/asm-generic/iomap.h~asm-generic-iomaph-add-stubs-for-pci-iomap-iounmap
+++ a/include/asm-generic/iomap.h
@@ -71,6 +71,14 @@ extern void ioport_unmap(void __iomem *)
struct pci_dev;
extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
+#else
+struct pci_dev;
+static inline void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
+{
+ return NULL;
+}
+static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
+{ }
#endif
#endif
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are
origin.patch
linux-next.patch
kernel-makefile-prevent-unnecessary-rebuilding-due-to-config_datagz.patch
drivers-scsi-megaraidc-fix-sparse-warnings.patch
tmpfs-expand-help-to-explain-value-of-tmpfs_posix_acl.patch
tmpfs-expand-help-to-explain-value-of-tmpfs_posix_acl-v3.patch
um-clean-up-vm-flagsh.patch
asm-generic-iomaph-add-stubs-for-pci-iomap-iounmap.patch
kernel-configsc-include-module_-when-config_ikconfig_proc=n.patch
leds-route-kbd-leds-through-the-generic-leds-layer.patch
misc-eeprom-add-driver-for-microwire-93xx46-eeprom-fix.patch
ipc-introduce-shm_rmid_forced-sysctl.patch
ipc-introduce-shm_rmid_forced-sysctl-fix.patch
ipc-introduce-shm_rmid_forced-sysctl-fix-2.patch
ipc-introduce-shm_rmid_forced-sysctl-testing.patch
init-add-root=partuuid=uuid-partnroff=%d-support.patch
documentation-add-pointer-to-name_to_dev_t-for-root=-values.patch
mutex-subsystem-synchro-test-module.patch
mutex-subsystem-synchro-test-module-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
