diff options
author | Laura Abbott | 2017-04-18 20:27:12 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2017-04-18 20:43:14 +0200 |
commit | 15c6098cfec543687164a05faeb859f8e4f7480b (patch) | |
tree | a9cbb74558562c1ed64cbf631e9ad89dd85ef7fe /drivers/staging/android/uapi | |
parent | staging: android: ion: Drop ion_map_kernel interface (diff) | |
download | kernel-qcow2-linux-15c6098cfec543687164a05faeb859f8e4f7480b.tar.gz kernel-qcow2-linux-15c6098cfec543687164a05faeb859f8e4f7480b.tar.xz kernel-qcow2-linux-15c6098cfec543687164a05faeb859f8e4f7480b.zip |
staging: android: ion: Remove ion_handle and ion_client
ion_handle was introduced as an abstraction to represent a reference to
a buffer via an ion_client. As frameworks outside of Ion evolved, the dmabuf
emerged as the preferred standard for use in the kernel. This has made
the ion_handle an unnecessary abstraction and prone to race
conditions. ion_client is also now only used internally. We have enough
mechanisms for race conditions and leaks already so just drop ion_handle
and ion_client. This also includes ripping out most of the debugfs
infrastructure since much of that was tied to clients and handles.
The debugfs infrastructure was prone to give confusing data (orphaned
allocations) so it can be replaced with something better if people
actually want it.
Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/uapi')
-rw-r--r-- | drivers/staging/android/uapi/ion.h | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/drivers/staging/android/uapi/ion.h b/drivers/staging/android/uapi/ion.h index bba1c47dac5c..b76db1b2e197 100644 --- a/drivers/staging/android/uapi/ion.h +++ b/drivers/staging/android/uapi/ion.h @@ -85,31 +85,8 @@ struct ion_allocation_data { __u64 len; __u32 heap_id_mask; __u32 flags; - __u32 handle; - __u32 unused; -}; - -/** - * struct ion_fd_data - metadata passed to/from userspace for a handle/fd pair - * @handle: a handle - * @fd: a file descriptor representing that handle - * - * For ION_IOC_SHARE or ION_IOC_MAP userspace populates the handle field with - * the handle returned from ion alloc, and the kernel returns the file - * descriptor to share or map in the fd field. For ION_IOC_IMPORT, userspace - * provides the file descriptor and the kernel returns the handle. - */ -struct ion_fd_data { - __u32 handle; __u32 fd; -}; - -/** - * struct ion_handle_data - a handle passed to/from the kernel - * @handle: a handle - */ -struct ion_handle_data { - __u32 handle; + __u32 unused; }; #define MAX_HEAP_NAME 32 |