X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-sh%2Fcache.h;h=083419f47c65a060a6d7ba20ab50954afa55f09d;hb=ffd8211fb18e1052b2d9eded629cc3c0b872d06a;hp=e3a180cf506285dbffe07273c60bc35837f54ce9;hpb=f0eef25339f92f7cd4aeea23d9ae97987a5a1e82;p=linux-2.6

diff --git a/include/asm-sh/cache.h b/include/asm-sh/cache.h
index e3a180cf50..083419f47c 100644
--- a/include/asm-sh/cache.h
+++ b/include/asm-sh/cache.h
@@ -9,18 +9,14 @@
 #define __ASM_SH_CACHE_H
 #ifdef __KERNEL__
 
+#include <linux/init.h>
 #include <asm/cpu/cache.h>
 
-#define SH_CACHE_VALID		1
-#define SH_CACHE_UPDATED	2
-#define SH_CACHE_COMBINED	4
-#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 */
@@ -48,5 +44,8 @@ struct cache_info {
 	unsigned long flags;
 };
 
+int __init detect_cpu_and_cache_system(void);
+
+#endif /* __ASSEMBLY__ */
 #endif /* __KERNEL__ */
 #endif /* __ASM_SH_CACHE_H */