OSDN Git Service

drm/i915: avoid rebuilding i915_gpu_error.o on version string updates
authorHans Holmberg <hans.holmberg@cnexlabs.com>
Wed, 21 Nov 2018 09:54:23 +0000 (10:54 +0100)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Thu, 22 Nov 2018 09:46:57 +0000 (11:46 +0200)
There is no need to rebuild i915_gpu_error.o when the version string
changes as the version is available in init_utsname()->release.

Signed-off-by: Hans Holmberg <hans.holmberg@cnexlabs.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181121095423.20760-1-hans.ml.holmberg@owltronix.com
drivers/gpu/drm/i915/i915_gpu_error.c

index 21b5c87..8123bf0 100644 (file)
@@ -27,7 +27,7 @@
  *
  */
 
-#include <generated/utsrelease.h>
+#include <linux/utsname.h>
 #include <linux/stop_machine.h>
 #include <linux/zlib.h>
 #include <drm/drm_print.h>
@@ -653,7 +653,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
 
        if (*error->error_msg)
                err_printf(m, "%s\n", error->error_msg);
-       err_printf(m, "Kernel: " UTS_RELEASE "\n");
+       err_printf(m, "Kernel: %s\n", init_utsname()->release);
        ts = ktime_to_timespec64(error->time);
        err_printf(m, "Time: %lld s %ld us\n",
                   (s64)ts.tv_sec, ts.tv_nsec / NSEC_PER_USEC);