The patch titled
Subject: [PATCH-RFC 02/10 v2] lib: add GENERIC_PCI_IOMAP
has been removed from the -mm tree. Its filename was
lib-add-generic_pci_iomap-v2.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
From: "Michael S. Tsirkin" <mst@xxxxxxxxxx>
Subject: [PATCH-RFC 02/10 v2] lib: add GENERIC_PCI_IOMAP
Changes from v1:
minor tweaks to address comments by Stephen Rothwell
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/asm-generic/io.h | 1 +
include/asm-generic/iomap.h | 2 +-
include/asm-generic/pci_iomap.h | 3 +--
lib/pci_iomap.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff -puN include/asm-generic/io.h~lib-add-generic_pci_iomap-v2 include/asm-generic/io.h
--- a/include/asm-generic/io.h~lib-add-generic_pci_iomap-v2
+++ a/include/asm-generic/io.h
@@ -285,6 +285,7 @@ static inline void writesb(const void __
#define __io_virt(x) ((void __force *) (x))
#ifndef CONFIG_GENERIC_IOMAP
+struct pci_dev;
static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)
{
}
diff -puN include/asm-generic/iomap.h~lib-add-generic_pci_iomap-v2 include/asm-generic/iomap.h
--- a/include/asm-generic/iomap.h~lib-add-generic_pci_iomap-v2
+++ a/include/asm-generic/iomap.h
@@ -67,7 +67,7 @@ extern void ioport_unmap(void __iomem *)
#endif
#ifdef CONFIG_PCI
-/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
+/* Destroy a virtual mapping cookie for a PCI BAR (memory or IO) */
struct pci_dev;
extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
#else
diff -puN include/asm-generic/pci_iomap.h~lib-add-generic_pci_iomap-v2 include/asm-generic/pci_iomap.h
--- a/include/asm-generic/pci_iomap.h~lib-add-generic_pci_iomap-v2
+++ a/include/asm-generic/pci_iomap.h
@@ -11,12 +11,11 @@
#ifndef __ASM_GENERIC_PCI_IOMAP_H
#define __ASM_GENERIC_PCI_IOMAP_H
+struct pci_dev;
#ifdef CONFIG_PCI
/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
-struct pci_dev;
extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
#else
-struct pci_dev;
static inline void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
{
return NULL;
diff -puN lib/pci_iomap.c~lib-add-generic_pci_iomap-v2 lib/pci_iomap.c
--- a/lib/pci_iomap.c~lib-add-generic_pci_iomap-v2
+++ a/lib/pci_iomap.c
@@ -6,7 +6,7 @@
#include <linux/pci.h>
#include <linux/io.h>
-#include <linux/module.h>
+#include <linux/export.h>
#ifdef CONFIG_PCI
/**
_
Patches currently in -mm which might be from mst@xxxxxxxxxx are
linux-next.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
