Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2801439 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ion: add new ion_user_handle_t type for the user-space token"

parents 49c8329c 508fb0bd

drivers/gpu/ion/ion.c

+2 −2
Original line number Diff line number Diff line
@@ -1305,7 +1305,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		if (IS_ERR(handle))

			return PTR_ERR(handle);



		data.handle = (struct ion_handle *)handle->id;

		data.handle = (ion_user_handle_t)handle->id;



		if (copy_to_user((void __user *)arg, &data, sizeof(data))) {

			ion_free(client, handle);
@@ -1358,7 +1358,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		if (IS_ERR(handle))

			ret = PTR_ERR(handle);

		else

			data.handle = (struct ion_handle *)handle->id;

			data.handle = (ion_user_handle_t)handle->id;



		if (copy_to_user((void __user *)arg, &data,

				 sizeof(struct ion_fd_data)))

include/uapi/linux/ion.h

+5 −3
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#include <linux/types.h>



struct ion_handle;

typedef struct ion_handle *ion_user_handle_t;



/**

 * enum ion_heap_types - list of all possible types of heaps

 * @ION_HEAP_TYPE_SYSTEM:	 memory allocated via vmalloc
@@ -90,7 +92,7 @@ struct ion_allocation_data { 
	size_t align;

	unsigned int heap_mask;

	unsigned int flags;

	struct ion_handle *handle;

	ion_user_handle_t handle;

};



/**
@@ -104,7 +106,7 @@ struct ion_allocation_data { 
 * provides the file descriptor and the kernel returns the handle.

 */

struct ion_fd_data {

	struct ion_handle *handle;

	ion_user_handle_t handle;

	int fd;

};
@@ -113,7 +115,7 @@ struct ion_fd_data { 
 * @handle:	a handle

 */

struct ion_handle_data {

	struct ion_handle *handle;

	ion_user_handle_t handle;

};



/**