X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=include%2Fasm-sh%2Fcache.h;h=01e5cf51ba9b38012469e7ceb0b78ab222e42fe5;hb=91cf45f02af5c871251165d000c3f42a2a0b0552;hp=33f13367054b89198d06b5d377c913b9fdfee61d;hpb=b638d0b921dc95229af0dfd09cd24850336a2f75;p=safe%2Fjmp%2Flinux-2.6

diff --git a/include/asm-sh/cache.h b/include/asm-sh/cache.h
index 33f1336..01e5cf5 100644
--- a/include/asm-sh/cache.h
+++ b/include/asm-sh/cache.h
@@ -9,8 +9,8 @@
 #define __ASM_SH_CACHE_H
 #ifdef __KERNEL__
 
+#include <linux/init.h>
 #include <asm/cpu/cache.h>
-#include <asm/cpu/cacheflush.h>
 
 #define SH_CACHE_VALID		1
 #define SH_CACHE_UPDATED	2
@@ -18,10 +18,10 @@
 #define SH_CACHE_ASSOC		8
 
 #define L1_CACHE_BYTES		(1 << L1_CACHE_SHIFT)
-#define SMP_CACHE_BYTES		L1_CACHE_BYTES
 
-#define L1_CACHE_ALIGN(x)	(((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1))
+#define __read_mostly __attribute__((__section__(".data.read_mostly")))
 
+#ifndef __ASSEMBLY__
 struct cache_info {
 	unsigned int ways;		/* Number of cache ways */
 	unsigned int sets;		/* Number of cache sets */
@@ -49,12 +49,8 @@ struct cache_info {
 	unsigned long flags;
 };
 
-/* Flush (write-back only) a region (smaller than a page) */
-extern void __flush_wback_region(void *start, int size);
-/* Flush (write-back & invalidate) a region (smaller than a page) */
-extern void __flush_purge_region(void *start, int size);
-/* Flush (invalidate only) a region (smaller than a page) */
-extern void __flush_invalidate_region(void *start, int size);
+int __init detect_cpu_and_cache_system(void);
 
+#endif /* __ASSEMBLY__ */
 #endif /* __KERNEL__ */
 #endif /* __ASM_SH_CACHE_H */