evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "soc: qcom: secure_buffer: add export symbol hyp_assign_phys"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-21 05:00:20 -07:00 • committed by Gerrit - the friendly Code Review server
commit 52429e5532
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/soc/qcom/secure_buffer.c
View file

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2011 Google, Inc * Copyright (C) 2011 Google, Inc
* Copyright (c) 2011-2016, The Linux Foundation. All rights reserved. * Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 and
@ -379,6 +379,7 @@ int hyp_assign_phys(phys_addr_t addr, u64 size, u32 *source_vm_list,
sg_free_table(&table); sg_free_table(&table);
return ret; return ret;
} }
EXPORT_SYMBOL(hyp_assign_phys);
const char *msm_secure_vmid_to_string(int secure_vmid) const char *msm_secure_vmid_to_string(int secure_vmid)
{ {

4
include/soc/qcom/secure_buffer.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 and
@ -53,7 +53,7 @@ int hyp_assign_table(struct sg_table *table,
u32 *source_vm_list, int source_nelems, u32 *source_vm_list, int source_nelems,
int *dest_vmids, int *dest_perms, int *dest_vmids, int *dest_perms,
int dest_nelems); int dest_nelems);
int hyp_assign_phys(phys_addr_t addr, u64 size, extern int hyp_assign_phys(phys_addr_t addr, u64 size,
u32 *source_vmlist, int source_nelems, u32 *source_vmlist, int source_nelems,
int *dest_vmids, int *dest_perms, int dest_nelems); int *dest_vmids, int *dest_perms, int dest_nelems);
bool msm_secure_v2_is_supported(void); bool msm_secure_v2_is_supported(void);