From 2d13d4e1e24c4d4163948c337f3b1860f011162b Mon Sep 17 00:00:00 2001
From: Vineet Gupta <vgupta@synopsys.com>
Date: Sat, 25 May 2013 14:04:25 +0530
Subject: [PATCH] --- yaml --- r: 376293 b: refs/heads/master c:
 7bb66f6e6eecdd8e10ed3a63bd28c1e9105adc79 h: refs/heads/master i:   376291:
 a9ba5a253e547c4681fce38749dc7206428c1f01 v: v3

---
 [refs]                            |  2 +-
 trunk/arch/arc/include/asm/page.h |  9 ---------
 trunk/arch/arc/mm/cache_arc700.c  | 21 +++++++++++----------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 27bafe3a3d64..660d64818d70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 006dfb3c9c44192f06093d65b3a876fa5ad1319a
+refs/heads/master: 7bb66f6e6eecdd8e10ed3a63bd28c1e9105adc79
diff --git a/trunk/arch/arc/include/asm/page.h b/trunk/arch/arc/include/asm/page.h
index 374a35514116..ab84bf131fe1 100644
--- a/trunk/arch/arc/include/asm/page.h
+++ b/trunk/arch/arc/include/asm/page.h
@@ -19,13 +19,6 @@
 #define clear_page(paddr)		memset((paddr), 0, PAGE_SIZE)
 #define copy_page(to, from)		memcpy((to), (from), PAGE_SIZE)
 
-#ifndef CONFIG_ARC_CACHE_VIPT_ALIASING
-
-#define clear_user_page(addr, vaddr, pg)	clear_page(addr)
-#define copy_user_page(vto, vfrom, vaddr, pg)	copy_page(vto, vfrom)
-
-#else	/* VIPT aliasing dcache */
-
 struct vm_area_struct;
 struct page;
 
@@ -35,8 +28,6 @@ void copy_user_highpage(struct page *to, struct page *from,
 			unsigned long u_vaddr, struct vm_area_struct *vma);
 void clear_user_page(void *to, unsigned long u_vaddr, struct page *page);
 
-#endif	/* CONFIG_ARC_CACHE_VIPT_ALIASING */
-
 #undef STRICT_MM_TYPECHECKS
 
 #ifdef STRICT_MM_TYPECHECKS
diff --git a/trunk/arch/arc/mm/cache_arc700.c b/trunk/arch/arc/mm/cache_arc700.c
index d4b7bb616840..aedce1905441 100644
--- a/trunk/arch/arc/mm/cache_arc700.c
+++ b/trunk/arch/arc/mm/cache_arc700.c
@@ -676,6 +676,17 @@ void flush_cache_range(struct vm_area_struct *vma, unsigned long start,
 	flush_cache_all();
 }
 
+void flush_anon_page(struct vm_area_struct *vma, struct page *page,
+		     unsigned long u_vaddr)
+{
+	/* TBD: do we really need to clear the kernel mapping */
+	__flush_dcache_page(page_address(page), u_vaddr);
+	__flush_dcache_page(page_address(page), page_address(page));
+
+}
+
+#endif
+
 void copy_user_highpage(struct page *to, struct page *from,
 	unsigned long u_vaddr, struct vm_area_struct *vma)
 {
@@ -725,16 +736,6 @@ void clear_user_page(void *to, unsigned long u_vaddr, struct page *page)
 	set_bit(PG_arch_1, &page->flags);
 }
 
-void flush_anon_page(struct vm_area_struct *vma, struct page *page,
-		     unsigned long u_vaddr)
-{
-	/* TBD: do we really need to clear the kernel mapping */
-	__flush_dcache_page(page_address(page), u_vaddr);
-	__flush_dcache_page(page_address(page), page_address(page));
-
-}
-
-#endif
 
 /**********************************************************************
  * Explicit Cache flush request from user space via syscall