From 287c0f679ef3d9237a75f8b8170d32ae5991656f Mon Sep 17 00:00:00 2001
From: Roman Zippel <zippel@linux-m68k.org>
Date: Sun, 25 Jun 2006 05:46:56 -0700
Subject: [PATCH] --- yaml --- r: 29639 b: refs/heads/master c:
 3921ee21e01ac5faecda640daa6071dc8f0e29c9 h: refs/heads/master i:   29637:
 474a889df41b9410336ec66a2b718a56f2b6c327   29635:
 f238191a004597198662b49619d66b6298facde5   29631:
 27b7e3a0539887fabc9e17c906537865f76fbada v: v3

---
 [refs]                              |  2 +-
 trunk/include/asm-m68k/cacheflush.h | 40 ++++++++++++++---------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 0eb90e41a371..088bb57b153a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7b1a1a3089aaf1168e3b68a40e98532063d7811
+refs/heads/master: 3921ee21e01ac5faecda640daa6071dc8f0e29c9
diff --git a/trunk/include/asm-m68k/cacheflush.h b/trunk/include/asm-m68k/cacheflush.h
index 8aba971b1368..24d3ff449135 100644
--- a/trunk/include/asm-m68k/cacheflush.h
+++ b/trunk/include/asm-m68k/cacheflush.h
@@ -3,26 +3,30 @@
 
 #include <linux/mm.h>
 
+/* cache code */
+#define FLUSH_I_AND_D	(0x00000808)
+#define FLUSH_I		(0x00000008)
+
 /*
  * Cache handling functions
  */
 
-#define flush_icache()						\
-({								\
-	if (CPU_IS_040_OR_060)					\
-		__asm__ __volatile__("nop\n\t"			\
-				     ".chip 68040\n\t"		\
-				     "cinva %%ic\n\t"		\
-				     ".chip 68k" : );		\
-	else {							\
-		unsigned long _tmp;				\
-		__asm__ __volatile__("movec %%cacr,%0\n\t"	\
-				     "orw %1,%0\n\t"		\
-				     "movec %0,%%cacr"		\
-				     : "=&d" (_tmp)		\
-				     : "id" (FLUSH_I));	\
-	}							\
-})
+static inline void flush_icache(void)
+{
+	if (CPU_IS_040_OR_060)
+		asm volatile (	"nop\n"
+			"	.chip	68040\n"
+			"	cpusha	%bc\n"
+			"	.chip	68k");
+	else {
+		unsigned long tmp;
+		asm volatile (	"movec	%%cacr,%0\n"
+			"	or.w	%1,%0\n"
+			"	movec	%0,%%cacr"
+			: "=&d" (tmp)
+			: "id" (FLUSH_I));
+	}
+}
 
 /*
  * invalidate the cache for the specified memory range.
@@ -43,10 +47,6 @@ extern void cache_push(unsigned long paddr, int len);
  */
 extern void cache_push_v(unsigned long vaddr, int len);
 
-/* cache code */
-#define FLUSH_I_AND_D	(0x00000808)
-#define FLUSH_I		(0x00000008)
-
 /* This is needed whenever the virtual mapping of the current
    process changes.  */
 #define __flush_cache_all()					\