From 26eeffd517c6d41de9446361bba0d0876ddac4de Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 28 May 2008 15:36:34 +0100
Subject: [PATCH] --- yaml --- r: 97411 b: refs/heads/master c:
 dc1d60a014aa9614518f9856ff661716d0969ffd h: refs/heads/master i:   97409:
 186d0f103edbe2efb742190e134768fe7133183f   97407:
 9b62f7c11a931020aebfdb80b7d4545f017b1113 v: v3

---
 [refs]                             | 2 +-
 trunk/include/asm-frv/mem-layout.h | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cde26fe2459c..3292740b22c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e55843bb8ed1ec7d134a759c53e34beb1618952
+refs/heads/master: dc1d60a014aa9614518f9856ff661716d0969ffd
diff --git a/trunk/include/asm-frv/mem-layout.h b/trunk/include/asm-frv/mem-layout.h
index 734a1d0583b6..8a15c90431b9 100644
--- a/trunk/include/asm-frv/mem-layout.h
+++ b/trunk/include/asm-frv/mem-layout.h
@@ -31,6 +31,13 @@
 
 #define PAGE_MASK			(~(PAGE_SIZE-1))
 
+/*
+ * the slab must be aligned such that load- and store-double instructions don't
+ * fault if used
+ */
+#define	ARCH_KMALLOC_MINALIGN		(sizeof(long) * 2)
+#define	ARCH_SLAB_MINALIGN		(sizeof(long) * 2)
+
 /*****************************************************************************/
 /*
  * virtual memory layout from kernel's point of view