aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2008-05-28 11:49:01 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-28 12:05:28 -0400
commit0a2ce2ffc358da96792d514c1024b72c52be9cc1 (patch)
tree7e62ed167dd0d222331c0098867c6fafb432b893
parentb4412323cc954bd0a2144b1c2ed573dd2eddb32c (diff)
Fix FRV minimum slab/kmalloc alignment
> +#define ARCH_KMALLOC_MINALIGN (sizeof(long) * 2) > +#define ARCH_SLAB_MINALIGN (sizeof(long) * 2) This doesn't work if SLAB is selected and slab debugging is enabled as these are passed to the preprocessor, and the preprocessor doesn't understand sizeof. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/asm-frv/mem-layout.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-frv/mem-layout.h b/include/asm-frv/mem-layout.h
index 8a15c90431b9..2947764fc0e0 100644
--- a/include/asm-frv/mem-layout.h
+++ b/include/asm-frv/mem-layout.h
@@ -35,8 +35,8 @@
35 * the slab must be aligned such that load- and store-double instructions don't 35 * the slab must be aligned such that load- and store-double instructions don't
36 * fault if used 36 * fault if used
37 */ 37 */
38#define ARCH_KMALLOC_MINALIGN (sizeof(long) * 2) 38#define ARCH_KMALLOC_MINALIGN 8
39#define ARCH_SLAB_MINALIGN (sizeof(long) * 2) 39#define ARCH_SLAB_MINALIGN 8
40 40
41/*****************************************************************************/ 41/*****************************************************************************/
42/* 42/*