aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Holmberg <hans.holmberg@cnexlabs.com>2018-11-21 04:54:23 -0500
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>2018-11-22 04:46:57 -0500
commit95fd94a645f75165134802987b21c6680ce90433 (patch)
tree6266d1dd63467fb544218de7c563794a303c1b62
parentaa6a65daca110df41ac0224bea1198dc97fd6695 (diff)
drm/i915: avoid rebuilding i915_gpu_error.o on version string updates
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
-rw-r--r--drivers/gpu/drm/i915/i915_gpu_error.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 21b5c8765015..8123bf0e4807 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -27,7 +27,7 @@
27 * 27 *
28 */ 28 */
29 29
30#include <generated/utsrelease.h> 30#include <linux/utsname.h>
31#include <linux/stop_machine.h> 31#include <linux/stop_machine.h>
32#include <linux/zlib.h> 32#include <linux/zlib.h>
33#include <drm/drm_print.h> 33#include <drm/drm_print.h>
@@ -653,7 +653,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
653 653
654 if (*error->error_msg) 654 if (*error->error_msg)
655 err_printf(m, "%s\n", error->error_msg); 655 err_printf(m, "%s\n", error->error_msg);
656 err_printf(m, "Kernel: " UTS_RELEASE "\n"); 656 err_printf(m, "Kernel: %s\n", init_utsname()->release);
657 ts = ktime_to_timespec64(error->time); 657 ts = ktime_to_timespec64(error->time);
658 err_printf(m, "Time: %lld s %ld us\n", 658 err_printf(m, "Time: %lld s %ld us\n",
659 (s64)ts.tv_sec, ts.tv_nsec / NSEC_PER_USEC); 659 (s64)ts.tv_sec, ts.tv_nsec / NSEC_PER_USEC);