summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-04-24 06:47:54 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-04-24 06:47:53 -0700
commitf9849a4c579ba09648b94c5212e2af87e015b263 (patch)
treec453fc5dfaebb7af1d8a585d7b45bdc0d86c9906
parentd4966a38bbea3f6d01f01798cb95eff9e7403b08 (diff)
parent42b8bf7d13add00738b5bc204cae0409d9728d37 (diff)
Merge "soc: qcom: Request GFP_NOIO for effective memory reclaim"
-rw-r--r--drivers/soc/qcom/scm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soc/qcom/scm.c b/drivers/soc/qcom/scm.c
index 045a5001fc9f..36804b988d62 100644
--- a/drivers/soc/qcom/scm.c
+++ b/drivers/soc/qcom/scm.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2017, 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
@@ -654,7 +654,7 @@ int scm_call2(u32 fn_id, struct scm_desc *desc)
if (unlikely(!is_scm_armv8()))
return -ENODEV;
- ret = allocate_extra_arg_buffer(desc, GFP_KERNEL);
+ ret = allocate_extra_arg_buffer(desc, GFP_NOIO);
if (ret)
return ret;