From 31a480c05df43b33dfe4a734a3dd0dccb0edaa01 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Mon, 24 May 2010 14:32:54 -0700
Subject: [PATCH] --- yaml --- r: 198271 b: refs/heads/master c:
 69dcf3db03626c4f18de624e8632454ea12ff260 h: refs/heads/master i:   198269:
 5d0c4db9167cf9bd735475eb5b0e330536d9b740   198267:
 74a657bd723fd52ae67404215bc9a276ec2e0cab   198263:
 9262869525e1f9634a47c9732e97ee9e0efccd39   198255:
 eca6786bffaa5fde2cd0d409c19062d680b9efbe   198239:
 d83e277a101d82286748bf8d7385bcd065c701c9   198207:
 8996e928b519fc285b4a0af84240dc8f97143e0d   198143:
 5c45800241cd1c8ff13308817ad501e2c582e831 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/frv/include/asm/cache.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a3ef5a58f097..9eedeb51b288 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ca8b9c0dafd1cb36289aa4c92c7beae7adcd34f
+refs/heads/master: 69dcf3db03626c4f18de624e8632454ea12ff260
diff --git a/trunk/arch/frv/include/asm/cache.h b/trunk/arch/frv/include/asm/cache.h
index 2797163b8f4f..7dc0f0f85b7c 100644
--- a/trunk/arch/frv/include/asm/cache.h
+++ b/trunk/arch/frv/include/asm/cache.h
@@ -17,6 +17,8 @@
 #define L1_CACHE_SHIFT		(CONFIG_FRV_L1_CACHE_SHIFT)
 #define L1_CACHE_BYTES		(1 << L1_CACHE_SHIFT)
 
+#define ARCH_KMALLOC_MINALIGN	L1_CACHE_BYTES
+
 #define __cacheline_aligned	__attribute__((aligned(L1_CACHE_BYTES)))
 #define ____cacheline_aligned	__attribute__((aligned(L1_CACHE_BYTES)))