diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 16:34:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 16:34:20 -0400 |
| commit | 711f77f53c5ff6aa61dbe8e5f518e50d6306e89d (patch) | |
| tree | 93bc99051b26586916a628b1a276543085f80ff2 /arch/sparc/include | |
| parent | 024a6b95181f2df6090975c8a293499d24bf8b28 (diff) | |
| parent | 273fca0ecad9305247043815e185d1bfd04047d4 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Define ARCH_SLAB_MINALIGN
drivers/sbus/char/flash.c: flash_read should update ppos instead of file->f_pos
sparc64: Fix stack dumping and tracing when function graph is enabled.
sparc64: Show stack backtrace from show_regs() just like other platforms.
Diffstat (limited to 'arch/sparc/include')
| -rw-r--r-- | arch/sparc/include/asm/cache.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h index 41f85ae4bd4a..78b07009f60a 100644 --- a/arch/sparc/include/asm/cache.h +++ b/arch/sparc/include/asm/cache.h | |||
| @@ -7,6 +7,8 @@ | |||
| 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))) | 14 | #define L1_CACHE_ALIGN(x) ((((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1))) |