Merge "msm: kgsl: fix mem_id_cmp()" (67e621ec) · Commits · e / devices / android_kernel_sony_msm8994

drivers/gpu/msm/kgsl.c

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3112,8 +3112,9 @@ long kgsl_ioctl_gpumem_sync_cache(struct kgsl_device_private *dev_priv,
	static int mem_id_cmp(const void _a, const void _b)		static int mem_id_cmp(const void _a, const void _b)
	{		{
	const unsigned int a = _a, b = _b;		const unsigned int a = _a, b = _b;
	int cmp = a - b;		if (a == b)
	return (cmp < 0) ? -1 : (cmp > 0);		return 0;
			return (a > b) ? 1 : -1;
	}		}

	long kgsl_ioctl_gpumem_sync_cache_bulk(struct kgsl_device_private *dev_priv,		long kgsl_ioctl_gpumem_sync_cache_bulk(struct kgsl_device_private *dev_priv,
	@@ -3148,7 +3149,7 @@ long kgsl_ioctl_gpumem_sync_cache_bulk(struct kgsl_device_private *dev_priv,
	goto end;		goto end;
	}		}
	/* sort the ids so we can weed out duplicates */		/* sort the ids so we can weed out duplicates */
	sort(id_list, param->count, sizeof(int), mem_id_cmp, NULL);		sort(id_list, param->count, sizeof(*id_list), mem_id_cmp, NULL);

	for (i = 0; i < param->count; i++) {		for (i = 0; i < param->count; i++) {
	unsigned int cachemode;		unsigned int cachemode;