diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-02 14:41:40 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-02 14:41:40 -0700 |
| commit | 8a4e6fcee3f7158d49983647d4ed7c4210c65e7f (patch) | |
| tree | da9ab22a6ec4b38e94219e4f4dd94065bfa0cf71 /drivers/soc | |
| parent | 875dca44ef3273bba823b36d7620042779b4a273 (diff) | |
| parent | fcca61799a8e0d93d44f4c75cb19f6604e3a882f (diff) | |
Merge "msm: secure_buffer: fix scm call argument layout"
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/qcom/secure_buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soc/qcom/secure_buffer.c b/drivers/soc/qcom/secure_buffer.c index d9ebc1edda9c..afe6b2309e27 100644 --- a/drivers/soc/qcom/secure_buffer.c +++ b/drivers/soc/qcom/secure_buffer.c @@ -52,7 +52,7 @@ struct mem_prot_info { struct dest_vm_and_perm_info { u32 vm; u32 perm; - u32 *ctx; + u64 ctx; u32 ctx_size; }; @@ -209,7 +209,7 @@ populate_dest_info(int *dest_vmids, int nelements, int *dest_perms, for (i = 0; i < nelements; i++) { dest_info[i].vm = dest_vmids[i]; dest_info[i].perm = dest_perms[i]; - dest_info[i].ctx = NULL; + dest_info[i].ctx = 0x0; dest_info[i].ctx_size = 0; } |