---

yaml --- r: 322565 b: refs/heads/master c: cb01b63 h: refs/heads/master i: 322563: 2de3936 v: v3
git-mirror · Aug 28, 2012 · e6e9a16 · e6e9a16
1 parent 55d1a18
commit e6e9a16
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb71285f0c1633a85544784aae7577502274b77a
+refs/heads/master: cb01b633eeb77ae7128cab0a3b5d3de56da6e913
diff --git a/trunk/arch/arm/mach-kirkwood/common.c b/trunk/arch/arm/mach-kirkwood/common.c
@@ -517,6 +517,13 @@ void __init kirkwood_wdt_init(void)
 void __init kirkwood_init_early(void)
 {
 	orion_time_set_base(TIMER_VIRT_BASE);
+
+	/*
+	 * Some Kirkwood devices allocate their coherent buffers from atomic
+	 * context. Increase size of atomic coherent pool to make sure such
+	 * the allocations won't fail.
+	 */
+	init_dma_coherent_pool_size(SZ_1M);
 }
 
 int kirkwood_tclk;