Revert "Revert "REVERT THIS BEFORE UPDATE ion: Rename heap_mask when used in userspace""

This reverts commit 92533119a9.
This commit is contained in:
followmsi 2019-04-17 16:31:43 +02:00
parent 02651df2b4
commit 7789393109

View file

@ -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;
};