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

Commit f029b748 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "staging: android: ion: Resolve prefetch 32bit compatibility"

parents 2a8a10e4 6c02048f

drivers/staging/android/ion/ion_system_secure_heap.c

+5 −3
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int alloc_prefetch_info( 
			bool shrink, struct list_head *items)

{

	struct prefetch_info *info;

	u64 __user *user_sizes;

	u64 user_sizes;

	int err;

	unsigned int nr_sizes, vmid, i;
@@ -236,7 +236,7 @@ static int alloc_prefetch_info( 
		if (!info)

			return -ENOMEM;



		err = get_user(info->size, &user_sizes[i]);

		err = get_user(info->size, ((u64 __user *)user_sizes + i));

		if (err)

			goto out_free;
@@ -270,7 +270,9 @@ static int __ion_system_secure_heap_resize(struct ion_heap *heap, void *ptr, 
		return -EINVAL;



	for (i = 0; i < data->nr_regions; i++) {

		ret = alloc_prefetch_info(&data->regions[i], shrink, &items);

		ret = alloc_prefetch_info(

			(struct ion_prefetch_regions *)data->regions + i,

			shrink, &items);

		if (ret)

			goto out_free;

	}

drivers/staging/android/uapi/msm_ion.h

+3 −3
Original line number Diff line number Diff line
@@ -96,15 +96,15 @@ enum ion_heap_ids { 
#define ION_IOC_MSM_MAGIC 'M'



struct ion_prefetch_regions {

	__u64 sizes;

	__u32 vmid;

	__u64 __user *sizes;

	__u32 nr_sizes;

};



struct ion_prefetch_data {

	__u32 heap_id;

	__u64 len;

	struct ion_prefetch_regions __user *regions;

	__u64 regions;

	__u32 heap_id;

	__u32 nr_regions;

};