refresh queue-3.4/drm-i915-restrict-kernel-address-leak-in-debugfs.patch

diff --git a/queue-3.4/drm-i915-restrict-kernel-address-leak-in-debugfs.patch b/queue-3.4/drm-i915-restrict-kernel-address-leak-in-debugfs.patch
index 12e5cde88f0afe1b7b2143fa69761b8c3f8a30b6..6bbcbc9bb23aee20ea58ec7535eedb839b8db88f 100644 (file)
--- a/queue-3.4/drm-i915-restrict-kernel-address-leak-in-debugfs.patch
+++ b/queue-3.4/drm-i915-restrict-kernel-address-leak-in-debugfs.patch
@@ -15,16 +15,18 @@ Signed-off-by: Kees Cook <keescook@chromium.org>
 Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
-diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
-index aae3148..7299ea4 100644
+---
+ drivers/gpu/drm/i915/i915_debugfs.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/drivers/gpu/drm/i915/i915_debugfs.c
 +++ b/drivers/gpu/drm/i915/i915_debugfs.c
-@@ -103,7 +103,7 @@ static const char *cache_level_str(int type)
+@@ -122,7 +122,7 @@ static const char *cache_level_str(int t
  static void
  describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)
  {
--      seq_printf(m, "%p: %s%s %8zdKiB %02x %02x %d %d %d%s%s%s",
-+      seq_printf(m, "%pK: %s%s %8zdKiB %02x %02x %d %d %d%s%s%s",
+-      seq_printf(m, "%p: %s%s %8zdKiB %04x %04x %d %d%s%s%s",
++      seq_printf(m, "%pK: %s%s %8zdKiB %04x %04x %d %d%s%s%s",
                   &obj->base,
                   get_pin_flag(obj),
                   get_tiling_flag(obj),