| From bfc9affe523ef2d2b72844b56151e82bbb602081 Mon Sep 17 00:00:00 2001 |
| From: Jani Nikula <jani.nikula@intel.com> |
| Date: Fri, 7 Jun 2013 16:03:50 +0300 |
| Subject: drm/i915: fix build warning on format specifier mismatch |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| drivers/gpu/drm/i915/i915_gem.c: In function ‘i915_gem_object_bind_to_gtt’: |
| drivers/gpu/drm/i915/i915_gem.c:3002:3: warning: format ‘%ld’ expects |
| argument of type ‘long int’, but argument 5 has type ‘size_t’ [-Wformat] |
| |
| v2: Use %zu instead of %d. Two char patch, and 100% wrong. (Ville) |
| |
| Signed-off-by: Jani Nikula <jani.nikula@intel.com> |
| Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 3765f3048651586e2617793e9efe184ff8c79a97) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/i915_gem.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c |
| index 70af73dff001..5fcee7608228 100644 |
| --- a/drivers/gpu/drm/i915/i915_gem.c |
| +++ b/drivers/gpu/drm/i915/i915_gem.c |
| @@ -3138,7 +3138,7 @@ i915_gem_object_bind_to_gtt(struct drm_i915_gem_object *obj, |
| * before evicting everything in a vain attempt to find space. |
| */ |
| if (obj->base.size > gtt_max) { |
| - DRM_ERROR("Attempting to bind an object larger than the aperture: object=%zd > %s aperture=%ld\n", |
| + DRM_ERROR("Attempting to bind an object larger than the aperture: object=%zd > %s aperture=%zu\n", |
| obj->base.size, |
| map_and_fenceable ? "mappable" : "total", |
| gtt_max); |
| -- |
| 1.8.5.rc3 |
| |
