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)))