From: Jean-Samuel Chenard <jsamch@gmail.com>
Date: Tue, 25 Mar 2008 06:35:08 +0000 (+0000)
Subject: UIO: add pgprot_noncached() to UIO mmap code
X-Git-Tag: v2.6.24.5~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b003ee8211d1e78f257dd91a5a24b425d330a1d;p=thirdparty%2Fkernel%2Fstable.git

UIO: add pgprot_noncached() to UIO mmap code

upstream commit: c9698d6b1a90929e427a165bd8283f803f57d9bd

Mapping of physical memory in UIO needs pgprot_noncached() to ensure
that IO memory is not cached. Without pgprot_noncached(), it (accidentally)
works on x86 and arm, but fails on PPC.

Signed-off-by: Jean-Samuel Chenard <jsamch@gmail.com>
Signed-off-by: Hans J Koch <hjk@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
---

diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 865f32b63b5c0..b4e10225aa61e 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -447,6 +447,8 @@ static int uio_mmap_physical(struct vm_area_struct *vma)
 
 	vma->vm_flags |= VM_IO | VM_RESERVED;
 
+	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+
 	return remap_pfn_range(vma,
 			       vma->vm_start,
 			       idev->info->mem[mi].addr >> PAGE_SHIFT,