[RESEND][PATCH][linux-next] Revert "drm/i915: fix build warning on 32-bit (v2)"

[Daniel Vetter]

On Mon, Apr 28, 2014 at 03:03:23PM +0200, Jan Moskyto Matejka wrote:
> This reverts commit 60f2b4af1258c05e6b037af866be81abc24438f7.
> 
> The same warning has been fixed in e5081a538a565284fec5f30a937d98e460d5e780 and
> these two commits got merged in 74e99a84de2d0980320612db8015ba606af42114 which
> caused another warning. Simply, the reverted commit casted the pointer
> difference to unsigned long and the other commit changed the output type from
> long to ptrdiff_t.
> 
> The other commit fixes the original warning the better way so I'm reverting
> this commit now.
> 
> Signed-off-by: Jan Moskyto Matejka <mq at suse.cz>

My apologies for missing this the first time around. Queued for -next,
thanks for the patch.
-Daniel
> ---
>  drivers/gpu/drm/i915/i915_cmd_parser.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c
> index 4cf6d02..0eaed44 100644
> --- a/drivers/gpu/drm/i915/i915_cmd_parser.c
> +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
> @@ -405,7 +405,7 @@ int i915_parse_cmds(struct intel_ring_buffer *ring,
>  			DRM_DEBUG_DRIVER("CMD: Command length exceeds batch length: 0x%08X length=%d batchlen=%td\n",
>  					 *cmd,
>  					 length,
> -					 (unsigned long)(batch_end - cmd));
> +					 batch_end - cmd);
>  			ret = -EINVAL;
>  			break;
>  		}
> -- 
> 1.8.4.5

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch