summaryrefslogtreecommitdiffstats
path: root/drivers/soc
diff options
context:
space:
mode:
authorSaurabh Sengar <saurabh.truth@gmail.com>2016-01-24 07:54:06 +0100
committerScott Wood <oss@buserror.net>2016-03-09 17:44:13 +0100
commit66923a60ad80a963c0cd5ceecba9ba377cefba47 (patch)
tree5e0ef713ee73aa660d38ef50013c1fa9a65fc65b /drivers/soc
parentqe: Make cpm_muram_alloc_common static (diff)
downloadlinux-66923a60ad80a963c0cd5ceecba9ba377cefba47.tar.xz
linux-66923a60ad80a963c0cd5ceecba9ba377cefba47.zip
qe: Use GFP_ATOMIC while spin_lock_irqsave is held
cpm_muram_alloc_common is called twice and both the times spin_lock_irqsave is held. Using GFP_KERNEL can sleep in spin_lock_irqsave context and cause deadlock Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com> Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/fsl/qe/qe_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/fsl/qe/qe_common.c b/drivers/soc/fsl/qe/qe_common.c
index e18159acfe45..41eff805a904 100644
--- a/drivers/soc/fsl/qe/qe_common.c
+++ b/drivers/soc/fsl/qe/qe_common.c
@@ -121,7 +121,7 @@ static unsigned long cpm_muram_alloc_common(unsigned long size,
goto out2;
start = start - GENPOOL_OFFSET;
memset_io(cpm_muram_addr(start), 0, size);
- entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+ entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
if (!entry)
goto out1;
entry->start = start;