From e6e9a1681980b9b0e7f157a6fd3e146bb4a58aa4 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Tue, 28 Aug 2012 20:57:41 +0200 Subject: [PATCH] --- yaml --- r: 322565 b: refs/heads/master c: cb01b633eeb77ae7128cab0a3b5d3de56da6e913 h: refs/heads/master i: 322563: 2de3936701808096e266ae7c530f722d14d1fa1d v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-kirkwood/common.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b3efa7b46c97..0251b72fe531 100644 --- 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 index c4b64adcbfce..d748f5033861 100644 --- 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;