diff options
| author | Roman Kiryanov <rkir@google.com> | 2018-03-20 13:40:04 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2018-05-02 04:31:13 +0000 |
| commit | ed11d8f2a0d07756acace1a2a295f29e41976358 (patch) | |
| tree | 5000a980241808ca9b5e934cd5a61e8f7820a67c | |
| parent | 00b597e73dd23d7cc54cef7d9231742be9523dc9 (diff) | |
goldfish: pipe: ANDROID: Allocate memory with GFP_KERNEL.
We use GFP_KERNEL in the outer context.
Bug: 72717639
Bug: 66884503
Change-Id: I5e10dba5138818351936ec0f70cd01070eaf199f
Signed-off-by: Roman Kiryanov <rkir@google.com>
| -rw-r--r-- | drivers/platform/goldfish/goldfish_pipe_v2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/goldfish/goldfish_pipe_v2.c b/drivers/platform/goldfish/goldfish_pipe_v2.c index e762e5df63de..590f6dea3c1b 100644 --- a/drivers/platform/goldfish/goldfish_pipe_v2.c +++ b/drivers/platform/goldfish/goldfish_pipe_v2.c @@ -658,7 +658,7 @@ static int get_free_pipe_id_locked(struct goldfish_pipe_dev *dev) u32 new_capacity = 2 * dev->pipes_capacity; struct goldfish_pipe **pipes = kcalloc(new_capacity, sizeof(*pipes), - GFP_ATOMIC); + GFP_KERNEL); if (!pipes) return -ENOMEM; memcpy(pipes, dev->pipes, sizeof(*pipes) * dev->pipes_capacity); |