summaryrefslogtreecommitdiffstats
path: root/drivers/platform/goldfish
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2017-05-21 00:45:46 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-25 18:26:11 +0200
commit3eff8ecd271d941b2326dba7defd0ca7c4c0baf5 (patch)
tree4272add2f2017fdf83bb482d87400a2771905638 /drivers/platform/goldfish
parent2ee1cc70552e5520a275254427c0c37fc81728d2 (diff)
downloadlinux-3eff8ecd271d941b2326dba7defd0ca7c4c0baf5.tar.bz2
goldfish_pipe: use GFP_ATOMIC under spin lock
The function get_free_pipe_id_locked() is called from goldfish_pipe_open() with a lock is held, so we should use GFP_ATOMIC instead of GFP_KERNEL. Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/platform/goldfish')
-rw-r--r--drivers/platform/goldfish/goldfish_pipe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index 2de1e603bd2b..5f3672153b12 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -704,7 +704,7 @@ static int get_free_pipe_id_locked(struct goldfish_pipe_dev *dev)
/* Reallocate the array */
u32 new_capacity = 2 * dev->pipes_capacity;
struct goldfish_pipe **pipes =
- kcalloc(new_capacity, sizeof(*pipes), GFP_KERNEL);
+ kcalloc(new_capacity, sizeof(*pipes), GFP_ATOMIC);
if (!pipes)
return -ENOMEM;
memcpy(pipes, dev->pipes, sizeof(*pipes) * dev->pipes_capacity);