[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 mild modifications to av...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f8f5dbfef686
branches:  trunk
changeset: 364162:f8f5dbfef686
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 05:57:29 2018 +0000

description:
mild modifications to avoid needing more headers


Author: coypu <coypu%sdf.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (35 lines):

diff -r 35c87d9be01e -r f8f5dbfef686 sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c      Mon Aug 27 05:50:06 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c      Mon Aug 27 05:57:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_gpu_error.c,v 1.5 2018/08/27 04:58:23 riastradh Exp $     */
+/*     $NetBSD: i915_gpu_error.c,v 1.6 2018/08/27 05:57:29 riastradh Exp $     */
 
 /*
  * Copyright (c) 2008 Intel Corporation
@@ -30,9 +30,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gpu_error.c,v 1.5 2018/08/27 04:58:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gpu_error.c,v 1.6 2018/08/27 05:57:29 riastradh Exp $");
 
-#include <generated/utsrelease.h>
+#include <sys/param.h>
+
 #include <asm/io.h>
 #include <linux/irqflags.h>
 #include "i915_drv.h"
@@ -354,9 +355,9 @@
        err_printf(m, "%s\n", error->error_msg);
        err_printf(m, "Time: %"PRIdMAX" s %ld us\n", (intmax_t)error->time.tv_sec,
                   (long)error->time.tv_usec);
-#ifndef __NetBSD__             /* XXX kernel version */
-       err_printf(m, "Kernel: " UTS_RELEASE "\n");
-#endif
+       err_printf(m, "Kernel: " __NetBSD_Version__ "\n");
+       err_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,
+                  error->time.tv_usec);
        max_hangcheck_score = 0;
        for (i = 0; i < ARRAY_SIZE(error->ring); i++) {
                if (error->ring[i].hangcheck_score > max_hangcheck_score)