diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
| commit | 0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3 (patch) | |
| tree | 92f55e374a84d06ce8213a4540454760fdecf137 /include/asm-sparc/cache.h | |
| parent | 8ef12c9f01afba47c2d33bb939085111ca0d0f7d (diff) | |
| parent | 5367f2d67c7d0bf1faae90e6e7b4e2ac3c9b5e0f (diff) | |
Merge Linus' tree.
Diffstat (limited to 'include/asm-sparc/cache.h')
| -rw-r--r-- | include/asm-sparc/cache.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc/cache.h b/include/asm-sparc/cache.h index a10522cb21b7..cb971e88aea4 100644 --- a/include/asm-sparc/cache.h +++ b/include/asm-sparc/cache.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #define L1_CACHE_SHIFT 5 | 13 | #define L1_CACHE_SHIFT 5 |
| 14 | #define L1_CACHE_BYTES 32 | 14 | #define L1_CACHE_BYTES 32 |
| 15 | #define L1_CACHE_ALIGN(x) ((((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1))) | 15 | #define L1_CACHE_ALIGN(x) ((((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1))) |
| 16 | #define L1_CACHE_SHIFT_MAX 5 /* largest L1 which this arch supports */ | ||
| 17 | 16 | ||
| 18 | #define SMP_CACHE_BYTES 32 | 17 | #define SMP_CACHE_BYTES 32 |
| 19 | 18 | ||