From e2df5339183bedcb932e7621f8013b602c1f985c Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Tue, 30 Oct 2007 17:28:52 +0900 Subject: [PATCH] --- yaml --- r: 73074 b: refs/heads/master c: 2278caa3c850c8f0aac4e1db7649a2c90cdaa9e9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-sh/cache.h | 3 --- trunk/include/asm-sh/processor.h | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7de0be5908d4..091875849729 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f9654f02ede996e5be73866da716b325a6fb66b +refs/heads/master: 2278caa3c850c8f0aac4e1db7649a2c90cdaa9e9 diff --git a/trunk/include/asm-sh/cache.h b/trunk/include/asm-sh/cache.h index 7a18649d1ccb..0fe7cf9a0433 100644 --- a/trunk/include/asm-sh/cache.h +++ b/trunk/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/trunk/include/asm-sh/processor.h b/trunk/include/asm-sh/processor.h index 4f2922a1979c..ab0028db645a 100644 --- a/trunk/include/asm-sh/processor.h +++ b/trunk/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]