summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-04-24 06:47:49 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-04-24 06:47:48 -0700
commitcf8fb0ea2ea0393409b8903a3fd9cfca2c71d914 (patch)
tree0d91666877dadd85b0007add6c8219d529b186a0
parent8495c8f05646e2149775f9bf54090cf59b67f5a9 (diff)
parent4a1ca04144ee2efe77ea2d7892045153fa2b204d (diff)
Merge "soc: qcom: glink: Change GFP_ATOMIC flag for intentless rx"
-rw-r--r--drivers/soc/qcom/glink_smem_native_xprt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/soc/qcom/glink_smem_native_xprt.c b/drivers/soc/qcom/glink_smem_native_xprt.c
index 85d51807077c..3f969234b705 100644
--- a/drivers/soc/qcom/glink_smem_native_xprt.c
+++ b/drivers/soc/qcom/glink_smem_native_xprt.c
@@ -678,7 +678,8 @@ static void process_rx_data(struct edge_info *einfo, uint16_t cmd_id,
err = true;
} else if (intent->data == NULL) {
if (einfo->intentless) {
- intent->data = kmalloc(cmd.frag_size, GFP_ATOMIC);
+ intent->data = kmalloc(cmd.frag_size,
+ __GFP_ATOMIC | __GFP_HIGH);
if (!intent->data) {
err = true;
GLINK_ERR(