delete queue-3.9/um-serve-io_remap_pfn_range.patch

diff --git a/queue-3.9/series b/queue-3.9/series
index adbee3fca9220b4acdb17127323315edfc078fb8..1f2d1a10e14a2a5299a9d629799aef6ce79df774 100644 (file)
--- a/queue-3.9/series
+++ b/queue-3.9/series
@@ -53,5 +53,4 @@ mm-memcg-remove-incorrect-vm_bug_on-for-swap-cache-pages-in-uncharge.patch
 drivers-block-brd.c-fix-brd_lookup_page-race.patch
 mm-pagewalk.c-walk_page_range-should-avoid-vm_pfnmap-areas.patch
 mm-thp-use-pmd_populate-to-update-the-pmd-with-pgtable_t-pointer.patch
-um-serve-io_remap_pfn_range.patch
 scsi-ipr-need-to-reset-adapter-after-the-6th-eeh-error.patch

diff --git a/queue-3.9/um-serve-io_remap_pfn_range.patch b/queue-3.9/um-serve-io_remap_pfn_range.patch
deleted file mode 100644 (file)
index 22a08dd..0000000
--- a/queue-3.9/um-serve-io_remap_pfn_range.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4d94d6d030adfdea4837694d293ec6918d133ab2 Mon Sep 17 00:00:00 2001
-From: Richard Weinberger <richard@nod.at>
-Date: Tue, 7 Feb 2012 01:22:47 +0100
-Subject: um: Serve io_remap_pfn_range()
-
-From: Richard Weinberger <richard@nod.at>
-
-commit 4d94d6d030adfdea4837694d293ec6918d133ab2 upstream.
-
-At some places io_remap_pfn_range() is needed.
-UML has to serve it like all other archs do.
-
-Signed-off-by: Richard Weinberger <richard@nod.at>
-Cc: Antoine Martin <antoine@nagafix.co.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/um/include/asm/pgtable.h |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/arch/um/include/asm/pgtable.h
-+++ b/arch/um/include/asm/pgtable.h
-@@ -71,6 +71,8 @@ extern unsigned long end_iomem;
- 
- #define io_remap_pfn_range    remap_pfn_range
- 
-+#define io_remap_pfn_range    remap_pfn_range
-+
- /*
-  * The i386 can't do page protection for execute, and considers that the same
-  * are read.