From e2b953cfaec6c639684be493b83d2d4c805d4577 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Thu, 15 Oct 2009 15:18:13 +0200
Subject: [PATCH] --- yaml --- r: 176125 b: refs/heads/master c:
 a1f55113ca2130f775eeebe799a401619bfd0295 h: refs/heads/master i:   176123:
 2f778b09cfdc06c259c738ae312a8fa0aecac53a v: v3

---
 [refs]                                         |  2 +-
 trunk/arch/microblaze/include/asm/cache.h      | 16 ----------------
 trunk/arch/microblaze/include/asm/cacheflush.h | 17 +++++++++++++++++
 trunk/arch/microblaze/kernel/process.c         |  1 +
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 4abacaf7654b..87b7f95fd368 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a8dfe1cac5c591aecf88b38b8f4b206ee636761
+refs/heads/master: a1f55113ca2130f775eeebe799a401619bfd0295
diff --git a/trunk/arch/microblaze/include/asm/cache.h b/trunk/arch/microblaze/include/asm/cache.h
index c209c47509d5..e52210891d78 100644
--- a/trunk/arch/microblaze/include/asm/cache.h
+++ b/trunk/arch/microblaze/include/asm/cache.h
@@ -21,20 +21,4 @@
 
 #define SMP_CACHE_BYTES	L1_CACHE_BYTES
 
-void _enable_icache(void);
-void _disable_icache(void);
-void _invalidate_icache(unsigned int addr);
-
-#define __enable_icache()		_enable_icache()
-#define __disable_icache()		_disable_icache()
-#define __invalidate_icache(addr)	_invalidate_icache(addr)
-
-void _enable_dcache(void);
-void _disable_dcache(void);
-void _invalidate_dcache(unsigned int addr);
-
-#define __enable_dcache()		_enable_dcache()
-#define __disable_dcache()		_disable_dcache()
-#define __invalidate_dcache(addr)	_invalidate_dcache(addr)
-
 #endif /* _ASM_MICROBLAZE_CACHE_H */
diff --git a/trunk/arch/microblaze/include/asm/cacheflush.h b/trunk/arch/microblaze/include/asm/cacheflush.h
index 088076e657b3..1f04b9111454 100644
--- a/trunk/arch/microblaze/include/asm/cacheflush.h
+++ b/trunk/arch/microblaze/include/asm/cacheflush.h
@@ -65,6 +65,23 @@
 #define flush_cache_vmap(start, end)		do { } while (0)
 #define flush_cache_vunmap(start, end)		do { } while (0)
 
+
+void _enable_icache(void);
+void _disable_icache(void);
+void _invalidate_icache(unsigned int addr);
+
+#define __enable_icache()		_enable_icache()
+#define __disable_icache()		_disable_icache()
+#define __invalidate_icache(addr)	_invalidate_icache(addr)
+
+void _enable_dcache(void);
+void _disable_dcache(void);
+void _invalidate_dcache(unsigned int addr);
+
+#define __enable_dcache()		_enable_dcache()
+#define __disable_dcache()		_disable_dcache()
+#define __invalidate_dcache(addr)	_invalidate_dcache(addr)
+
 struct page;
 struct mm_struct;
 struct vm_area_struct;
diff --git a/trunk/arch/microblaze/kernel/process.c b/trunk/arch/microblaze/kernel/process.c
index c592d475b3d8..812f1bf06c9e 100644
--- a/trunk/arch/microblaze/kernel/process.c
+++ b/trunk/arch/microblaze/kernel/process.c
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <asm/system.h>
 #include <asm/pgalloc.h>
+#include <asm/cacheflush.h>
 
 void show_regs(struct pt_regs *regs)
 {