From 113b7b1eb7e906da07809759fb16f4674f52c80d Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 24 Oct 2009 14:11:59 +0100
Subject: [PATCH] --- yaml --- r: 172385 b: refs/heads/master c:
 7b0a1003e780193e2a11c27f5059c26b65f60679 h: refs/heads/master i:   172383:
 698488a629b7dea237140a26a3b94aad1c93cbee v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/include/asm/cacheflush.h | 2 --
 trunk/arch/arm/mm/fault-armv.c          | 2 ++
 trunk/arch/arm/mm/mm.h                  | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6e3a82efbdd5..ff9d945e0c25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 421fe93cc4b06b2f5e875cbe0f692800d4862ee5
+refs/heads/master: 7b0a1003e780193e2a11c27f5059c26b65f60679
diff --git a/trunk/arch/arm/include/asm/cacheflush.h b/trunk/arch/arm/include/asm/cacheflush.h
index 61ae25caaacb..9fd6d3ab68c0 100644
--- a/trunk/arch/arm/include/asm/cacheflush.h
+++ b/trunk/arch/arm/include/asm/cacheflush.h
@@ -420,8 +420,6 @@ extern void flush_ptrace_access(struct vm_area_struct *vma, struct page *page,
  */
 extern void flush_dcache_page(struct page *);
 
-extern void __flush_dcache_page(struct address_space *mapping, struct page *page);
-
 static inline void __flush_icache_all(void)
 {
 #ifdef CONFIG_ARM_ERRATA_411920
diff --git a/trunk/arch/arm/mm/fault-armv.c b/trunk/arch/arm/mm/fault-armv.c
index 4fbc7de8b4ac..729602291958 100644
--- a/trunk/arch/arm/mm/fault-armv.c
+++ b/trunk/arch/arm/mm/fault-armv.c
@@ -23,6 +23,8 @@
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
 
+#include "mm.h"
+
 static unsigned long shared_pte_mask = L_PTE_MT_BUFFERABLE;
 
 /*
diff --git a/trunk/arch/arm/mm/mm.h b/trunk/arch/arm/mm/mm.h
index c4f6f05198e0..a888363398f8 100644
--- a/trunk/arch/arm/mm/mm.h
+++ b/trunk/arch/arm/mm/mm.h
@@ -24,6 +24,8 @@ struct mem_type {
 
 const struct mem_type *get_mem_type(unsigned int type);
 
+extern void __flush_dcache_page(struct address_space *mapping, struct page *page);
+
 #endif
 
 struct map_desc;