From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Feb 2009 16:57:29 +0000 (-0800)
Subject: i915: Fix more size_t format string warnings
X-Git-Tag: v2.6.29-rc5~49
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f06da264cfb0f9444d41ca247213e419f90aa72a;p=pandora-kernel.git

i915: Fix more size_t format string warnings

The DRI people seem to have a hard time getting these right (see also
commit aeb565dfc3ac4c8b47c5049085b4c7bfb2c7d5d7).

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 1441831fa06e..818576654092 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1457,7 +1457,7 @@ static void i915_write_fence_reg(struct drm_i915_fence_reg *reg)
 
 	if ((obj_priv->gtt_offset & ~I915_FENCE_START_MASK) ||
 	    (obj_priv->gtt_offset & (obj->size - 1))) {
-		WARN(1, "%s: object 0x%08x not 1M or size (0x%x) aligned\n",
+		WARN(1, "%s: object 0x%08x not 1M or size (0x%zx) aligned\n",
 		     __func__, obj_priv->gtt_offset, obj->size);
 		return;
 	}