mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
Revert "Revert "REVERT THIS BEFORE UPDATE ion: Rename heap_mask when used in userspace""
This reverts commit 92533119a9
.
This commit is contained in:
parent
02651df2b4
commit
7789393109
1 changed files with 5 additions and 0 deletions
|
@ -530,7 +530,12 @@ static inline struct ion_handle *ion_dma_buf_to_handle(
|
|||
struct ion_allocation_data {
|
||||
size_t len;
|
||||
size_t align;
|
||||
#ifdef __KERNEL__
|
||||
unsigned int heap_mask;
|
||||
#else
|
||||
/* Userspace wants this renamed... */
|
||||
unsigned int heap_id_mask;
|
||||
#endif
|
||||
unsigned int flags;
|
||||
struct ion_handle *handle;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue