MN10300: SMP: Differentiate local cache flushing

Differentiate local cache flushing from global cache flushing so that they can
be done differently on SMP systems.

Rename the cache functions from:

	mn10300_[id]cache_*()

to:

	mn10300_[id]_localcache_*()

and on a UP system, assign the global labels to the local labels.

Signed-off-by: Akira Takeuchi <takeuchi.akr@jp.panasonic.com>
Signed-off-by: Kiyoshi Owada <owada.kiyoshi@jp.panasonic.com>
Signed-off-by: David Howells <dhowells@redhat.com>

1 files changed, 50 insertions, 0 deletions

diff --git a/arch/mn10300/include/asm/cacheflush.h b/arch/mn10300/include/asm/cacheflush.h
index a9f41688961a..748143f65418 100644
--- a/arch/mn10300/include/asm/cacheflush.h
+++ b/arch/mn10300/include/asm/cacheflush.h
@@ -20,12 +20,31 @@
  * Primitive routines
  */
 #ifdef CONFIG_MN10300_CACHE_ENABLED
+extern void mn10300_local_icache_inv(void);
+extern void mn10300_local_icache_inv_page(unsigned long start);
+extern void mn10300_local_icache_inv_range(unsigned long start, unsigned long end);
+extern void mn10300_local_icache_inv_range2(unsigned long start, unsigned long size);
+extern void mn10300_local_dcache_inv(void);
+extern void mn10300_local_dcache_inv_page(unsigned long start);
+extern void mn10300_local_dcache_inv_range(unsigned long start, unsigned long end);
+extern void mn10300_local_dcache_inv_range2(unsigned long start, unsigned long size);
 extern void mn10300_icache_inv(void);
+extern void mn10300_icache_inv_page(unsigned long start);
+extern void mn10300_icache_inv_range(unsigned long start, unsigned long end);
+extern void mn10300_icache_inv_range2(unsigned long start, unsigned long size);
 extern void mn10300_dcache_inv(void);
 extern void mn10300_dcache_inv_page(unsigned long start);
 extern void mn10300_dcache_inv_range(unsigned long start, unsigned long end);
 extern void mn10300_dcache_inv_range2(unsigned long start, unsigned long size);
 #ifdef CONFIG_MN10300_CACHE_WBACK
+extern void mn10300_local_dcache_flush(void);
+extern void mn10300_local_dcache_flush_page(unsigned long start);
+extern void mn10300_local_dcache_flush_range(unsigned long start, unsigned long end);
+extern void mn10300_local_dcache_flush_range2(unsigned long start, unsigned long size);
+extern void mn10300_local_dcache_flush_inv(void);
+extern void mn10300_local_dcache_flush_inv_page(unsigned long start);
+extern void mn10300_local_dcache_flush_inv_range(unsigned long start, unsigned long end);
+extern void mn10300_local_dcache_flush_inv_range2(unsigned long start, unsigned long size);
 extern void mn10300_dcache_flush(void);
 extern void mn10300_dcache_flush_page(unsigned long start);
 extern void mn10300_dcache_flush_range(unsigned long start, unsigned long end);
@@ -35,6 +54,18 @@ extern void mn10300_dcache_flush_inv_page(unsigned long start);
 extern void mn10300_dcache_flush_inv_range(unsigned long start, unsigned long end);
 extern void mn10300_dcache_flush_inv_range2(unsigned long start, unsigned long size);
 #else
+#define mn10300_local_dcache_flush()                    do {} while (0)
+#define mn10300_local_dcache_flush_page(start)          do {} while (0)
+#define mn10300_local_dcache_flush_range(start, end)    do {} while (0)
+#define mn10300_local_dcache_flush_range2(start, size)  do {} while (0)
+#define mn10300_local_dcache_flush_inv() \
+                mn10300_local_dcache_inv()
+#define mn10300_local_dcache_flush_inv_page(start) \
+                mn10300_local_dcache_inv_page(start)
+#define mn10300_local_dcache_flush_inv_range(start, end) \
+                mn10300_local_dcache_inv_range(start, end)
+#define mn10300_local_dcache_flush_inv_range2(start, size) \
+                mn10300_local_dcache_inv_range2(start, size)
 #define mn10300_dcache_flush()                          do {} while (0)
 #define mn10300_dcache_flush_page(start)                do {} while (0)
 #define mn10300_dcache_flush_range(start, end)          do {} while (0)
@@ -48,7 +79,26 @@ extern void mn10300_dcache_flush_inv_range2(unsigned long start, unsigned long s
         mn10300_dcache_inv_range2((start), (size))
 #endif /* CONFIG_MN10300_CACHE_WBACK */
 #else
+#define mn10300_local_icache_inv()                      do {} while (0)
+#define mn10300_local_icache_inv_page(start)            do {} while (0)
+#define mn10300_local_icache_inv_range(start, end)      do {} while (0)
+#define mn10300_local_icache_inv_range2(start, size)    do {} while (0)
+#define mn10300_local_dcache_inv()                      do {} while (0)
+#define mn10300_local_dcache_inv_page(start)            do {} while (0)
+#define mn10300_local_dcache_inv_range(start, end)      do {} while (0)
+#define mn10300_local_dcache_inv_range2(start, size)    do {} while (0)
+#define mn10300_local_dcache_flush()                    do {} while (0)
+#define mn10300_local_dcache_flush_inv_page(start)      do {} while (0)
+#define mn10300_local_dcache_flush_inv()                do {} while (0)
+#define mn10300_local_dcache_flush_inv_range(start, end)do {} while (0)
+#define mn10300_local_dcache_flush_inv_range2(start, size) do {} while (0)
+#define mn10300_local_dcache_flush_page(start)          do {} while (0)
+#define mn10300_local_dcache_flush_range(start, end)    do {} while (0)
+#define mn10300_local_dcache_flush_range2(start, size)  do {} while (0)
 #define mn10300_icache_inv()                            do {} while (0)
+#define mn10300_icache_inv_page(start)                  do {} while (0)
+#define mn10300_icache_inv_range(start, end)            do {} while (0)
+#define mn10300_icache_inv_range2(start, size)          do {} while (0)
 #define mn10300_dcache_inv()                            do {} while (0)
 #define mn10300_dcache_inv_page(start)                  do {} while (0)
 #define mn10300_dcache_inv_range(start, end)            do {} while (0)