aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_debugfs.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-09 08:44:23 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-09 08:44:23 +0100
commite94f16a4fde646b3f155788fe37339b61264b0a9 (patch)
tree28f1cf8b1980b6b25c1c58e3e157610a1b851996 /drivers/gpu/drm/i915/i915_debugfs.c
parentd2b5851d8583e690eeb5ac8dfff5da92e1f1468f (diff)
parent9eccca0843205f87c00404b663188b88eb248051 (diff)
downloadkernel_replicant_linux-e94f16a4fde646b3f155788fe37339b61264b0a9.tar.gz
kernel_replicant_linux-e94f16a4fde646b3f155788fe37339b61264b0a9.tar.bz2
kernel_replicant_linux-e94f16a4fde646b3f155788fe37339b61264b0a9.zip
Merge 4.0-rc3 into char-misc-next
We want the mei fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
-rw-r--r--drivers/gpu/drm/i915/i915_debugfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 96e811fe24ca..e8b18e542da4 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -152,12 +152,12 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)
seq_puts(m, " (pp");
else
seq_puts(m, " (g");
- seq_printf(m, "gtt offset: %08lx, size: %08lx, type: %u)",
+ seq_printf(m, "gtt offset: %08llx, size: %08llx, type: %u)",
vma->node.start, vma->node.size,
vma->ggtt_view.type);
}
if (obj->stolen)
- seq_printf(m, " (stolen: %08lx)", obj->stolen->start);
+ seq_printf(m, " (stolen: %08llx)", obj->stolen->start);
if (obj->pin_mappable || obj->fault_mappable) {
char s[3], *t = s;
if (obj->pin_mappable)