From 10981902935b70f945002566d2fb0ee584d7784f Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Fri, 23 Nov 2012 18:15:32 +0000
Subject: [PATCH] --- yaml --- r: 339198 b: refs/heads/master c:
 8f3bfa584ed05e9e7d290707c48eee026fb94ece h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/arm64/include/asm/cacheflush.h | 11 +++++++++--
 trunk/arch/arm64/mm/flush.c               |  9 ---------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 3cf6a0793216..ed2dfff39c83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88a24cffad7d98f16de52fe5dd2d71f64cb21585
+refs/heads/master: 8f3bfa584ed05e9e7d290707c48eee026fb94ece
diff --git a/trunk/arch/arm64/include/asm/cacheflush.h b/trunk/arch/arm64/include/asm/cacheflush.h
index aa3132ab7f29..3300cbd18a89 100644
--- a/trunk/arch/arm64/include/asm/cacheflush.h
+++ b/trunk/arch/arm64/include/asm/cacheflush.h
@@ -70,13 +70,20 @@
  *		- size   - region size
  */
 extern void flush_cache_all(void);
-extern void flush_cache_mm(struct mm_struct *mm);
 extern void flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned long end);
-extern void flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr, unsigned long pfn);
 extern void flush_icache_range(unsigned long start, unsigned long end);
 extern void __flush_dcache_area(void *addr, size_t len);
 extern void __flush_cache_user_range(unsigned long start, unsigned long end);
 
+static inline void flush_cache_mm(struct mm_struct *mm)
+{
+}
+
+static inline void flush_cache_page(struct vm_area_struct *vma,
+				    unsigned long user_addr, unsigned long pfn)
+{
+}
+
 /*
  * Copy user data from/to a page which is mapped into a different
  * processes address space.  Really, we want to allow our "user
diff --git a/trunk/arch/arm64/mm/flush.c b/trunk/arch/arm64/mm/flush.c
index c144adb1682f..88611c3a421a 100644
--- a/trunk/arch/arm64/mm/flush.c
+++ b/trunk/arch/arm64/mm/flush.c
@@ -27,10 +27,6 @@
 
 #include "mm.h"
 
-void flush_cache_mm(struct mm_struct *mm)
-{
-}
-
 void flush_cache_range(struct vm_area_struct *vma, unsigned long start,
 		       unsigned long end)
 {
@@ -38,11 +34,6 @@ void flush_cache_range(struct vm_area_struct *vma, unsigned long start,
 		__flush_icache_all();
 }
 
-void flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr,
-		      unsigned long pfn)
-{
-}
-
 static void flush_ptrace_access(struct vm_area_struct *vma, struct page *page,
 				unsigned long uaddr, void *kaddr,
 				unsigned long len)