diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-01-17 23:33:46 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-01-17 23:33:46 -0800 |
| commit | 8e3c05cbebbff7a06e30fbca34109ad95db23fd7 (patch) | |
| tree | f947879a1beac614a2d0a49b94e6aac7fef93b5e | |
| parent | 174c638decf9ec35fad5c42a6da5fbf1d32e6cca (diff) | |
| parent | 07ebb0bad998647b56e45318ed2f95bd12ab5f76 (diff) | |
Merge "soc: qcom: hab: adapt to the new get_user_pages()"
| -rw-r--r-- | drivers/soc/qcom/hab/hab_mem_linux.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/soc/qcom/hab/hab_mem_linux.c b/drivers/soc/qcom/hab/hab_mem_linux.c index 670efdea212f..13bfab41f75d 100644 --- a/drivers/soc/qcom/hab/hab_mem_linux.c +++ b/drivers/soc/qcom/hab/hab_mem_linux.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2019, 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 @@ -361,8 +361,7 @@ int habmem_hyp_grant_user(unsigned long address, ret = get_user_pages(current, current->mm, address, page_count, - 1, - 1, + FOLL_WRITE | FOLL_FORCE, pages, NULL); } |