From 2010049aa53c210156598c979fd38dc893baa049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Tue, 12 May 2015 11:48:18 +0200 Subject: [PATCH] mailbox: bcm2708-vcio: Allocation does not need to be atomic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No need to do atomic allocation in a context that can sleep. Signed-off-by: Noralf Trønnes --- drivers/mailbox/bcm2708-vcio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mailbox/bcm2708-vcio.c b/drivers/mailbox/bcm2708-vcio.c index ee3e778541e95..74a7fcbf5199c 100644 --- a/drivers/mailbox/bcm2708-vcio.c +++ b/drivers/mailbox/bcm2708-vcio.c @@ -212,7 +212,7 @@ extern int bcm_mailbox_property(void *data, int size) mutex_lock(&mailbox_lock); /* allocate some memory for the messages communicating with GPU */ mem_kern = dma_alloc_coherent(NULL, PAGE_ALIGN(size), &mem_bus, - GFP_ATOMIC); + GFP_KERNEL); if (mem_kern) { /* create the message */ mbox_copy_from_user(mem_kern, data, size);