From d42c880427d432e0f5a3939945429b5dcb1d392b Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Feb 2009 08:57:29 -0800
Subject: [PATCH] --- yaml --- r: 131151 b: refs/heads/master c:
 f06da264cfb0f9444d41ca247213e419f90aa72a h: refs/heads/master i:   131149:
 1b508fc5fe432c2cb8a573ca93e692aa0599fd8d   131147:
 c80d21df349f8db6fbeb585a4c657a2d6864c674   131143:
 e65289b4c1d34549aae8d62d7156eac4c643e45c   131135:
 d388d67bf479513b414b9bea80e65d1d2eae6ed6 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 69c600a279d7..df52fe42f6a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff7473300d429118aa97368ba5a16bc63aecfc75
+refs/heads/master: f06da264cfb0f9444d41ca247213e419f90aa72a
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index 1441831fa06e..818576654092 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/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;
 	}