sh: Use generic SMP_CACHE_BYTES/L1_CACHE_ALIGN.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/include/asm-sh/cache.h b/include/asm-sh/cache.h
index 7a18649d1ccb873af58880fdd933f4f21d50469a..0fe7cf9a04339aec08b34e6232f941e0ab0ae2ee 100644 (file)
--- a/include/asm-sh/cache.h
+++ b/include/asm-sh/cache.h
@@ -18,9 +18,6 @@
 #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))
 
 #ifndef __ASSEMBLY__
 struct cache_info {

diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h
index 4f2922a1979c5fef654b9444c818123773cd4eab..ab0028db645a49d0ed24a4c1a25363ef51f81f60 100644 (file)
--- a/include/asm-sh/processor.h
+++ b/include/asm-sh/processor.h
@@ -71,7 +71,7 @@ struct sh_cpuinfo {
        struct cache_info scache;       /* Secondary cache */
 
        unsigned long flags;
-} __attribute__ ((aligned(SMP_CACHE_BYTES)));
+} __attribute__ ((aligned(L1_CACHE_BYTES)));
 
 extern struct sh_cpuinfo cpu_data[];
 #define boot_cpu_data cpu_data[0]