3.0-stable patches

added patches:
	um-serve-io_remap_pfn_range.patch

diff --git a/queue-3.0/series b/queue-3.0/series
index e98723a8173867dce25d81bce12d2ffa8ed30649..4e590ddd8466debc2c5aa40c88e2c5f598531863 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -20,3 +20,4 @@ nilfs2-fix-issue-of-nilfs_set_page_dirty-for-page-at-eof-boundary.patch
 mm-mmu_notifier-re-fix-freed-page-still-mapped-in-secondary-mmu.patch
 drivers-block-brd.c-fix-brd_lookup_page-race.patch
 mm-thp-use-pmd_populate-to-update-the-pmd-with-pgtable_t-pointer.patch
+um-serve-io_remap_pfn_range.patch

diff --git a/queue-3.0/um-serve-io_remap_pfn_range.patch b/queue-3.0/um-serve-io_remap_pfn_range.patch
new file mode 100644 (file)
index 0000000..2473e03
--- /dev/null
+++ b/queue-3.0/um-serve-io_remap_pfn_range.patch
@@ -0,0 +1,31 @@
+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
+@@ -69,6 +69,8 @@ extern unsigned long end_iomem;
+ #define PAGE_KERNEL   __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED)
+ #define PAGE_KERNEL_EXEC      __pgprot(__PAGE_KERNEL_EXEC)
+ 
++#define io_remap_pfn_range    remap_pfn_range
++
+ /*
+  * The i386 can't do page protection for execute, and considers that the same
+  * are read.