The patch titled
m68k: small flush_icache() cleanup
has been added to the -mm tree. Its filename is
m68k-small-flush_icache-cleanup.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: m68k: small flush_icache() cleanup
From: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Make flush_icache() an inline function and clean it up a litte.
Signed-off-by: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-m68k/cacheflush.h | 40 ++++++++++++++++----------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff -puN include/asm-m68k/cacheflush.h~m68k-small-flush_icache-cleanup include/asm-m68k/cacheflush.h
--- a/include/asm-m68k/cacheflush.h~m68k-small-flush_icache-cleanup
+++ a/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 pad
*/
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() \
_
Patches currently in -mm which might be from zippel@xxxxxxxxxxxxxx are
origin.patch
git-kbuild.patch
64-bit-resources-kconfig-change.patch
m68k-fix-uaccessh-for-gcc-3x.patch
m68k-fix-constraints-of-the-signal-functions-and-some-cleanup.patch
m68k-fix-__iounmap-for-030.patch
m68k-small-flush_icache-cleanup.patch
m68k-add-the-generic-dma-api-functions.patch
m68k-dma-api-addition.patch
m68k-fix-show_registers.patch
m68k-separate-handler-for-auto-and-user-vector-interrupt.patch
m68k-cleanup-generic-irq-names.patch
m68k-cleanup-amiga-irq-numbering.patch
m68k-introduce-irq-controller.patch
m68k-convert-generic-irq-code-to-irq-controller.patch
m68k-convert-amiga-irq-code.patch
m68k-convert-apollo-irq-code.patch
m68k-convert-atari-irq-code.patch
m68k-convert-hp300-irq-code.patch
m68k-convert-mac-irq-code.patch
m68k-convert-q40-irq-code.patch
m68k-convert-sun3-irq-code.patch
m68k-convert-vme-irq-code.patch
affs_fill_super-%s-abuses-2.patch
reintegrate-irqreturnh-into-hardirqh.patch
time-use-clocksource-abstraction-for-ntp-adjustments-optimize-out-some-mults-since-gcc-cant-avoid-them.patch
time-rename-clocksource-functions.patch
fix-and-optimize-clock-source-update.patch
fix-rt-mutex-defaults-and-dependencies.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
