From: Paul Mundt Date: Tue, 30 Oct 2007 08:28:52 +0000 (+0900) Subject: sh: Use generic SMP_CACHE_BYTES/L1_CACHE_ALIGN. X-Git-Tag: v2.6.24-rc2~47^2~13 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2278caa3c850c8f0aac4e1db7649a2c90cdaa9e9;p=linux-2.6 sh: Use generic SMP_CACHE_BYTES/L1_CACHE_ALIGN. Signed-off-by: Paul Mundt --- diff --git a/include/asm-sh/cache.h b/include/asm-sh/cache.h index 7a18649d1c..0fe7cf9a04 100644 --- 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 4f2922a197..ab0028db64 100644 --- 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]