From: Greg Kroah-Hartman Date: Sun, 26 May 2013 19:18:47 +0000 (+0900) Subject: 3.0-stable patches X-Git-Tag: v3.0.81~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5baba20990fac0b892b45fc4316323598b23e51a;p=thirdparty%2Fkernel%2Fstable-queue.git 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 e98723a8173..4e590ddd846 100644 --- 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 index 00000000000..2473e039cbd --- /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 +Date: Tue, 7 Feb 2012 01:22:47 +0100 +Subject: um: Serve io_remap_pfn_range() + +From: Richard Weinberger + +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 +Cc: Antoine Martin +Signed-off-by: Greg Kroah-Hartman + +--- + 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.