---

yaml --- r: 131151 b: refs/heads/master c: f06da26 h: refs/heads/master i: 131149: 1b508fc 131147: c80d21d 131143: e65289b 131135: d388d67 v: v3
git-mirror · Feb 9, 2009 · d42c880 · d42c880
1 parent e702aac
commit d42c880
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 	}