From 24d2ca69a47342ff39539f234d5be5aa64ad82c8 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Thu, 6 May 2010 15:15:28 +0100
Subject: [PATCH] --- yaml --- r: 190879 b: refs/heads/master c:
 b5a07faadeb4e0cfd6dcee359e501d4755cab875 h: refs/heads/master i:   190877:
 39a98b8d3629870ffa498d50eae33aff479ec2f9   190875:
 d2da6b3bf8259b2c6d442dd7d2ccabffa5a673da   190871:
 6cc49596ac3f786c7c39b78a1d9eaf9ecf56453d   190863:
 206950935ca8e6419fca39f23a724923280c2e6d   190847:
 782c7d73cfca66cea785255193fbd2eb31e4af1f v: v3

---
 [refs]                    | 2 +-
 trunk/arch/arm/mm/nommu.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ca2be78ba9a8..8de8932c49ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1a9ceb2e003aab7b96e30d990c1092453a0ea44
+refs/heads/master: b5a07faadeb4e0cfd6dcee359e501d4755cab875
diff --git a/trunk/arch/arm/mm/nommu.c b/trunk/arch/arm/mm/nommu.c
index f8791eed7594..33b327379f07 100644
--- a/trunk/arch/arm/mm/nommu.c
+++ b/trunk/arch/arm/mm/nommu.c
@@ -65,6 +65,15 @@ void flush_dcache_page(struct page *page)
 }
 EXPORT_SYMBOL(flush_dcache_page);
 
+void copy_to_user_page(struct vm_area_struct *vma, struct page *page,
+		       unsigned long uaddr, void *dst, const void *src,
+		       unsigned long len)
+{
+	memcpy(dst, src, len);
+	if (vma->vm_flags & VM_EXEC)
+		__cpuc_coherent_user_range(uaddr, uaddr + len);
+}
+
 void __iomem *__arm_ioremap_pfn(unsigned long pfn, unsigned long offset,
 				size_t size, unsigned int mtype)
 {