Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / asm-sh / cache.h

diff --git a/include/asm-sh/cache.h b/include/asm-sh/cache.h
index 9decb1c..656fdfe 100644 (file)
--- a/include/asm-sh/cache.h
+++ b/include/asm-sh/cache.h
@@ -1,4 +1,4 @@
-/* $Id: cache.h,v 1.5 2003/07/16 04:08:29 lethal Exp $
+/* $Id: cache.h,v 1.6 2004/03/11 18:08:05 lethal Exp $
  *
  * include/asm-sh/cache.h
  *
@@ -7,6 +7,7 @@
  */
 #ifndef __ASM_SH_CACHE_H
 #define __ASM_SH_CACHE_H
+#ifdef __KERNEL__
 
 #include <asm/cpu/cache.h>
 #include <asm/cpu/cacheflush.h>
@@ -21,14 +22,13 @@
 
 #define L1_CACHE_ALIGN(x)      (((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1))
 
-#define L1_CACHE_SHIFT_MAX     5       /* largest L1 which this arch supports */
-
 struct cache_info {
        unsigned int ways;
        unsigned int sets;
        unsigned int linesz;
 
-       unsigned int way_shift;
+       unsigned int way_incr;
+
        unsigned int entry_shift;
        unsigned int entry_mask;
 
@@ -42,5 +42,5 @@ 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);
 
+#endif /* __KERNEL__ */
 #endif /* __ASM_SH_CACHE_H */
-