From: Jan Moskyto Matejka <mq@suse•cz>
To: Daniel Vetter <daniel.vetter@ffwll•ch>,
Jani Nikula <jani.nikula@linux•intel.com>,
intel-gfx@lists•freedesktop.org, dri-devel@lists•freedesktop.org,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Cc: Jan Moskyto Matejka <mq@suse•cz>
Subject: [PATCH] Revert "drm/i915: fix build warning on 32-bit (v2)"
Date: Thu, 3 Apr 2014 14:53:57 +0200 [thread overview]
Message-ID: <1396529637-15395-1-git-send-email-mq@suse.cz> (raw)
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.
---
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
next reply other threads:[~2014-04-03 12:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-03 12:53 Jan Moskyto Matejka [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-04-07 11:07 [PATCH] Revert "drm/i915: fix build warning on 32-bit (v2)" Jan Moskyto Matejka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1396529637-15395-1-git-send-email-mq@suse.cz \
--to=mq@suse$(echo .)cz \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=jani.nikula@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox