diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:13:54 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:13:54 -0400 |
| commit | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (patch) | |
| tree | 9e57efcb106ae912f7bec718feb3f8ec607559bb /arch/sparc/include/asm/cache.h | |
| parent | 162500b3a3ff39d941d29db49b41a16667ae44f0 (diff) | |
| parent | 9b2a606d3898fcb2eedb6faded3bb37549590ac4 (diff) | |
Merge branches 'gemini' and 'misc' into devel
Diffstat (limited to 'arch/sparc/include/asm/cache.h')
| -rw-r--r-- | arch/sparc/include/asm/cache.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h index 41f85ae4bd4a..69358b590c91 100644 --- a/arch/sparc/include/asm/cache.h +++ b/arch/sparc/include/asm/cache.h | |||
| @@ -7,9 +7,10 @@ | |||
| 7 | #ifndef _SPARC_CACHE_H | 7 | #ifndef _SPARC_CACHE_H |
| 8 | #define _SPARC_CACHE_H | 8 | #define _SPARC_CACHE_H |
| 9 | 9 | ||
| 10 | #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long) | ||
| 11 | |||
| 10 | #define L1_CACHE_SHIFT 5 | 12 | #define L1_CACHE_SHIFT 5 |
| 11 | #define L1_CACHE_BYTES 32 | 13 | #define L1_CACHE_BYTES 32 |
| 12 | #define L1_CACHE_ALIGN(x) ((((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1))) | ||
| 13 | 14 | ||
| 14 | #ifdef CONFIG_SPARC32 | 15 | #ifdef CONFIG_SPARC32 |
| 15 | #define SMP_CACHE_BYTES_SHIFT 5 | 16 | #define SMP_CACHE_BYTES_SHIFT 5 |
| @@ -19,7 +20,7 @@ | |||
| 19 | 20 | ||
| 20 | #define SMP_CACHE_BYTES (1 << SMP_CACHE_BYTES_SHIFT) | 21 | #define SMP_CACHE_BYTES (1 << SMP_CACHE_BYTES_SHIFT) |
| 21 | 22 | ||
| 22 | #define __read_mostly __attribute__((__section__(".data.read_mostly"))) | 23 | #define __read_mostly __attribute__((__section__(".data..read_mostly"))) |
| 23 | 24 | ||
| 24 | #ifdef CONFIG_SPARC32 | 25 | #ifdef CONFIG_SPARC32 |
| 25 | #include <asm/asi.h> | 26 | #include <asm/asi.h> |