summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoralf Trønnes <noralf@tronnes.org>2015-05-12 11:48:18 +0200
committerpopcornmix <popcornmix@gmail.com>2015-05-18 14:13:18 +0100
commit4403b12cce0d16b015f28160ea2829d8e2e1f5a4 (patch)
treec2efdccfff1b0c4071f33b11976f562d0acd9245
parente332ea1b6134932ad31fff02c66d1fb069441303 (diff)
downloadlinux-4403b12cce0d16b015f28160ea2829d8e2e1f5a4.tar.gz
mailbox: bcm2708-vcio: Allocation does not need to be atomic
No need to do atomic allocation in a context that can sleep. Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-rw-r--r--drivers/mailbox/bcm2708-vcio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mailbox/bcm2708-vcio.c b/drivers/mailbox/bcm2708-vcio.c
index ee3e778541e9..74a7fcbf5199 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);