summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMahesh Sivasubramanian <msivasub@codeaurora.org>2015-12-01 15:06:54 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 21:16:32 -0700
commit71c79b78ab64711bc18ef6ca1ae961d16a2a953a (patch)
treedd3f50b10445a5247591270d73b6d04931399419
parent531fca9ffc17f68c49be65beafc0fc5138a21d2d (diff)
soc: qcom: rpm: Change driver memory allocation to use GFP_NOFS
When a filesystem driver calls into makes a RPM request, RPM driver makes a kzalloc request with GFP_KERNEL flag. This results in a deadlock if a driver waiting on IO completion sends a RPM message. Change memory allocation in the RPM driver to use GFP_NOFS. Change-Id: Ic10b4d45ee9097c419d39b48b3aef6d3b41045e6 Signed-off-by: Mahesh Sivasubramanian <msivasub@codeaurora.org>
-rw-r--r--drivers/soc/qcom/rpm-smd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soc/qcom/rpm-smd.c b/drivers/soc/qcom/rpm-smd.c
index 9eef7bd06676..d2985de75807 100644
--- a/drivers/soc/qcom/rpm-smd.c
+++ b/drivers/soc/qcom/rpm-smd.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -82,7 +82,7 @@ static struct glink_apps_rpm_data *glink_data;
#define DEFAULT_BUFFER_SIZE 256
#define DEBUG_PRINT_BUFFER_SIZE 512
#define MAX_SLEEP_BUFFER 128
-#define GFP_FLAG(noirq) (noirq ? GFP_ATOMIC : GFP_KERNEL)
+#define GFP_FLAG(noirq) (noirq ? GFP_ATOMIC : GFP_NOFS)
#define INV_RSC "resource does not exist"
#define ERR "err\0"
#define MAX_ERR_BUFFER_SIZE 128